Bump to 3.3.12

Update Changelog.
Bump _WIN32_IE in cmake build
2025-10-28 14:50:53 +01:00 · 2017-04-06 19:51:12 +03:00 · 2017-04-06 19:48:23 +03:00 · 2017-04-06 19:47:21 +03:00 · 2017-04-06 19:47:08 +03:00 · 2017-04-06 02:04:31 +03:00
105 changed files with 856 additions and 327 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -89,10 +89,6 @@ before_install:
      # setup virtual display for after_success target
      if [ "$gui" = true ]; then export "DISPLAY=:99.0" && /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 ; fi ;
    fi
-  - |
-    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-      qbtconf="$qbtconf --disable-qt-dbus" ;
-    fi

  # print settings
  - echo $lt_branch
@@ -182,7 +178,11 @@ script:
 after_success:
  - if [ "$gui" = true ]; then qbt_exe="qbittorrent" ; else qbt_exe="qbittorrent-nox" ; fi
  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cd "$qbt_path/bin" ; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cd "$TRAVIS_BUILD_DIR/src/" && macdeployqt "$qbt_exe.app" && cd "$qbt_exe.app/Contents/MacOS" ; fi
+  - |
+    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+      macdeployqt "$TRAVIS_BUILD_DIR/src/$qbt_exe.app" ;
+      cd "$TRAVIS_BUILD_DIR/src/$qbt_exe.app/Contents/MacOS" ;
+    fi
  - ./$qbt_exe --version

 after_script:
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,15 +17,17 @@ endif()

 set(PROJECT_VERSION "${PROJECT_VERSION}${VER_STATUS}")

-add_definitions(-DVERSION_MAJOR=${VER_MAJOR})
-add_definitions(-DVERSION_MINOR=${VER_MINOR})
-add_definitions(-DVERSION_BUGFIX=${VER_BUGFIX})
-add_definitions(-DVERSION_BUILD=${VER_BUILD})
+add_definitions(-DQBT_VERSION_MAJOR=${VER_MAJOR})
+add_definitions(-DQBT_VERSION_MINOR=${VER_MINOR})
+add_definitions(-DQBT_VERSION_BUGFIX=${VER_BUGFIX})
+add_definitions(-DQBT_VERSION_BUILD=${VER_BUILD})

 # os2 {
-#     DEFINES += VERSION=\'\"v$${PROJECT_VERSION}\"\'
+#     DEFINES += DQBT_VERSION=\'\"v$${PROJECT_VERSION}\"\'
+#     DEFINES += DQBT_VERSION_2=\'\"$${PROJECT_VERSION}\"\'
 # } else {
-add_definitions(-DVERSION="v${PROJECT_VERSION}")
+add_definitions(-DQBT_VERSION="v${PROJECT_VERSION}")
+add_definitions(-DQBT_VERSION_2="${PROJECT_VERSION}")
 # }

 # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Og")
--- a/CODING_GUIDELINES.md
+++ b/CODING_GUIDELINES.md
@@ -138,14 +138,14 @@ However, there are cases where curly braces for single statement if blocks **sho

 Generally it will depend on the particular piece of code and would be determined on how readable that piece of code is. **If in doubt** always use braces if one of the above exceptions applies.

-### 3. Indentation###
+### 3. Indentation ###
 4 spaces.

-### 4. File encoding and line endings.###
+### 4. File encoding and line endings. ###

 UTF-8 and Unix-like line ending (LF). Unless some platform specific files need other encodings/line endings.

-### 5. Initialization lists.###
+### 5. Initialization lists. ###
 Initialization lists should be vertical. This will allow for more easily readable diffs. The initialization colon should be indented and in its own line along with first argument. The rest of the arguments should be indented too and have the comma prepended.
 ```c++
 myClass::myClass(int a, int b, int c, int d)
@@ -158,7 +158,7 @@ myClass::myClass(int a, int b, int c, int d)
 }
 ```

-### 6. Enums.###
+### 6. Enums. ###
 Enums should be vertical. This will allow for more easily readable diffs. The members should be indented.
 ```c++
 enum Days
@@ -173,7 +173,7 @@ enum Days
 };
 ```

-### 7. Names.###
+### 7. Names. ###
 All names should be camelCased.

 #### a. Type names and namespaces ####
@@ -207,7 +207,7 @@ class MyClass
 }
 ```

-### 8. Header inclusion order.###
+### 8. Header inclusion order. ###
 The headers should be placed in the following order:
 1. Module header (in .cpp)
 2. System/Qt/Boost etc. headers (splitted in subcategories if you have many).
@@ -240,7 +240,7 @@ Example:

 ```

-### 9. Misc.###
+### 9. Misc. ###

 * Line breaks for long lines with operation:

@@ -304,5 +304,5 @@ for (int a = 0; a < b; ++b) {

 * Method definitions aren't allowed in header files

-###10. Not covered above###
-If something isn't covered above, just follow the same style the file you are editing has. If that particular detail isn't present in the file you are editing, then use whatever the rest of the project uses.
+### 10. Not covered above ###
+If something isn't covered above, just follow the same style the file you are editing has. If that particular detail isn't present in the file you are editing, then use whatever the rest of the project uses.
--- a/24
+++ b/24
@@ -1,3 +1,27 @@
+* Thu Apr 06 2017 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.12
+    - FEATURE: Indicate bitness in stackstrace and about dialog. Closes #6172. (sledgehammer999)
+    - BUGFIX: Fix incomplete type compile error with Qt4 (Chocobo1)
+    - BUGFIX: Fix compile error: ‘escape’ is not a member of ‘Qt’ (Chocobo1)
+    - BUGFIX: Use system locale to format dates/time/etc (sledgehammer999)
+    - BUGFIX: Follow http user-agent format (Chocobo1)
+    - BUGFIX: Fix cancel "Set location" causes files move to installation dir. (Chocobo1)
+    - WEBUI: Improve performance of updating 'progress' column (buinsky)
+    - WEBUI: Implement statistics window in web UI (FranciscoPombal)
+    - WEBUI: fixed "remaining" column in WebUI (FranciscoPombal)
+    - WEBUI: Set HttpOnly attribute to SID cookie (Chocobo1)
+    - WEBUI: Fire up the timer to clean inactive sessions (Chocobo1)
+    - WEBUI: Set cookie SID value to empty on logout (Chocobo1)
+    - WINDOWS: Make the installer DPI aware (regs01)
+    - WINDOWS: Set exit code to 0 on install/uninstall success. Fixes problem with silent installations. (Chocobo1)
+    - WINDOWS: The 64-bit installer refuses to install on 32-bit systems. (sledgehammer999)
+    - WINDOWS: The 64-bit installer uses the correct "Program Files" now. Detection will not work if you install on top of previous installer. (sledgehammer999)
+    - WINDOWS: Fix running the uninstaller if the user chose a different path in the installer. Closes #6080. (sledgehammer999)
+    - LINUX: Add keywords to the .desktop file. (sledgehammer999)
+    - LINUX: Update stuff in appdata.xml and run 'appstream-utl upgrade' on it. (sledgehammer999)
+    - OTHER: Replace rand() by a true uniform distribution generator (Chocobo1)
+    - OTHER: Change our user-agent format as indicated earlier in the news section (Chocobo1)
+    - OTHER: cmake: fix OSX bundle creation (evsh)
+
 * Fri Mar 03 2017 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.11
    - FEATURE: Always show progress and remaining bytes for unselected files. (sledgehammer999)
    - FEATURE: Allow to change priority for unselected files through the combobox like it is done via the context menu. (sledgehammer999)
--- a/cmake/Modules/winconf.cmake
+++ b/cmake/Modules/winconf.cmake
@@ -3,7 +3,7 @@
 # We want to link with static version of
 # libtorrent
 set(LibtorrentRasterbar_USE_STATIC_LIBS True)
-set(LibtorrentRasterbar_CUSTOM_DEFINITIONS 
+set(LibtorrentRasterbar_CUSTOM_DEFINITIONS
    -DBOOST_ALL_NO_LIB -DBOOST_ASIO_HASH_MAP_BUCKETS=1021
    -DBOOST_ASIO_SEPARATE_COMPILATION
    -DBOOST_EXCEPTION_DISABLE
@@ -17,8 +17,9 @@ add_definitions(-DUNICODE
    -DWIN32
    -D_WIN32
    -DWIN32_LEAN_AND_MEAN
+    -DNTDDI_VERSION=0x05010000
    -D_WIN32_WINNT=0x0501
-    -D_WIN32_IE=0x0500
+    -D_WIN32_IE=0x0501
    -D_CRT_SECURE_NO_DEPRECATE
    -D_SCL_SECURE_NO_DEPRECATE
 )
--- a/dist/mac/Info.plist
+++ b/dist/mac/Info.plist
@@ -45,7 +45,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.3.11</string>
+	<string>3.3.12</string>
 	<key>CFBundleSignature</key>
 	<string>qBit</string>
 	<key>CFBundleExecutable</key>
--- a/dist/mac/bundle.cmake
+++ b/dist/mac/bundle.cmake
@@ -1,2 +1,3 @@
+set(BU_CHMOD_BUNDLE_ITEMS ON)
 include(BundleUtilities)
 fixup_bundle("$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/qbittorrent.app" "" "")
--- a/dist/unix/qBittorrent.appdata.xml
+++ b/dist/unix/qBittorrent.appdata.xml
@@ -1,61 +1,66 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014 sledgehammer999 <sledgehammer999@qbittorrent.org> -->
 <component type="desktop">
- <id>qBittorrent.desktop</id>
- <metadata_license>CC0-1.0</metadata_license>
- <project_license>GPL-2.0 and OpenSSL</project_license>
- <name>qBittorrent</name>
- <summary>A Bittorrent Client</summary>
- <description>
-  <p>
+  <id>qBittorrent.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0 and OpenSSL</project_license>
+  <name>qBittorrent</name>
+  <summary>A Bittorrent Client</summary>
+  <description>
+    <p>
   Aiming to be a good alternative to all other bittorrent clients out
   there, qBittorrent is fast, stable and provides unicode support as well
   as many other features. Additionally, qBittorrent runs and provides those
   same features on all major platforms (Linux, Mac OS X, Windows, OS/2, FreeBSD).
  </p>
-  <p>
+    <p>
   It is programmed in C++ / Qt and uses libtorrent (sometimes called
   libtorrent-rasterbar) by Arvid Norberg. GeoLite data, created by MaxMind,
   are included in qBittorrent. Its features include:
  </p>
-  <ul>
-   <li>Polished µTorrent-like User Interface</li>
-   <li>Well-integrated and extensible Search Engine</li>
-   <li>All Bittorrent extensions (DHT, Peer Exchange, Full encryption, Magnet/BitComet URIs, ...)</li>
-   <li>Remote control through a Web user interface</li>
-   <li>Advanced control over trackers, peers and torrents</li>
-   <li>UPnP / NAT-PMP port forwarding support</li>
-   <li>Available in ~25 languages (Unicode support)</li>
-   <li>Torrent creation tool</li>
-   <li>Advanced RSS support with download filters (inc. regex)</li>
-   <li>Bandwidth scheduler</li>
-   <li>IP Filtering (eMule and PeerGuardian compatible)</li>
-   <li>IPv6 compliant</li>
-   <li>Sequential downloading (aka "Download in order")</li>
-  </ul>
- </description>
- <screenshots>
-  <screenshot type="default">
-   <image width="1200" height="675">
+    <ul>
+      <li>Polished µTorrent-like User Interface</li>
+      <li>Well-integrated and extensible Search Engine</li>
+      <li>All Bittorrent extensions (DHT, Peer Exchange, Full encryption, Magnet/BitComet URIs, ...)</li>
+      <li>Remote control through a Web user interface</li>
+      <li>Advanced control over trackers, peers and torrents</li>
+      <li>UPnP / NAT-PMP port forwarding support</li>
+      <li>Available in ~25 languages (Unicode support)</li>
+      <li>Torrent creation tool</li>
+      <li>Advanced RSS support with download filters (inc. regex)</li>
+      <li>Bandwidth scheduler</li>
+      <li>IP Filtering (eMule and PeerGuardian compatible)</li>
+      <li>IPv6 compliant</li>
+      <li>Sequential downloading (aka "Download in order")</li>
+    </ul>
+  </description>
+  <screenshots>
+    <screenshot type="default">
+      <image height="675" width="1200">
    https://alexpl.fedorapeople.org/AppData/qbittorrent/screens/qbittorrent_01.png
   </image>
-  </screenshot>
-  <screenshot>
-   <image width="1200" height="675">
+    </screenshot>
+    <screenshot>
+      <image height="675" width="1200">
    https://alexpl.fedorapeople.org/AppData/qbittorrent/screens/qbittorrent_02.png
   </image>
-  </screenshot>
-  <screenshot>
-   <image width="1200" height="675">
+    </screenshot>
+    <screenshot>
+      <image height="675" width="1200">
    https://alexpl.fedorapeople.org/AppData/qbittorrent/screens/qbittorrent_03.png
   </image>
-  </screenshot>
-  <screenshot>
-   <image width="1200" height="675">
+    </screenshot>
+    <screenshot>
+      <image height="675" width="1200">
    https://alexpl.fedorapeople.org/AppData/qbittorrent/screens/qbittorrent_04.png
   </image>
-  </screenshot>
- </screenshots>
- <url type="homepage">http://www.qbittorrent.org/</url>
- <update_contact>sledgehammer999@qbittorrent.org</update_contact>
+    </screenshot>
+  </screenshots>
+  <url type="homepage">http://www.qbittorrent.org/</url>
+  <update_contact>sledgehammer999@qbittorrent.org</update_contact>
+  <developer_name>The qBittorrent Project</developer_name>
+  <url type="bugtracker">http://bugs.qbittorrent.org/</url>
+  <url type="donation">https://www.qbittorrent.org/donate</url>
+  <url type="help">http://forum.qbittorrent.org/</url>
+  <url type="translate">https://github.com/qbittorrent/qBittorrent/wiki/How-to-translate-qBittorrent</url>
 </component>
--- a/dist/windows/installer-translations/afrikaans.nsi
+++ b/dist/windows/installer-translations/afrikaans.nsi
@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_AFRIKAANS} "A previous installation wa
 LangString inst_unist ${LANG_AFRIKAANS} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_AFRIKAANS} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_AFRIKAANS} "This installer works only in 64-bit Windows versions."


 ;------------------------------------
--- a/dist/windows/installer-translations/albanian.nsi
+++ b/dist/windows/installer-translations/albanian.nsi
@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_ALBANIAN} "A previous installation was
 LangString inst_unist ${LANG_ALBANIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_ALBANIAN} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_ALBANIAN} "This installer works only in 64-bit Windows versions."


 ;------------------------------------
--- a/dist/windows/installer-translations/arabic.nsi
+++ b/dist/windows/installer-translations/arabic.nsi
@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_ARABIC} "A previous installation was d
 LangString inst_unist ${LANG_ARABIC} "جاري ازالة النسخة السابقة من البرنامج"
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_ARABIC} "تشغيل البرنامج"
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_ARABIC} "This installer works only in 64-bit Windows versions."


 ;------------------------------------
--- a/dist/windows/installer-translations/basque.nsi
+++ b/dist/windows/installer-translations/basque.nsi
@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_BASQUE} "A previous installation was d
 LangString inst_unist ${LANG_BASQUE} "Aurreko bertsioa kentzen."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_BASQUE} "Abiarazi qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_BASQUE} "This installer works only in 64-bit Windows versions."


 ;------------------------------------
--- a/dist/windows/installer-translations/belarusian.nsi
+++ b/dist/windows/installer-translations/belarusian.nsi
@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_BELARUSIAN} "A previous installation w
 LangString inst_unist ${LANG_BELARUSIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_BELARUSIAN} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_BELARUSIAN} "This installer works only in 64-bit Windows versions."


 ;------------------------------------
--- a/dist/windows/installer-translations/bosnian.nsi
+++ b/dist/windows/installer-translations/bosnian.nsi
@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_BOSNIAN} "A previous installation was
 LangString inst_unist ${LANG_BOSNIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_BOSNIAN} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_BOSNIAN} "This installer works only in 64-bit Windows versions."


 ;------------------------------------
--- a/dist/windows/installer-translations/breton.nsi
+++ b/dist/windows/installer-translations/breton.nsi
@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_BRETON} "A previous installation was d
 LangString inst_unist ${LANG_BRETON} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_BRETON} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_BRETON} "This installer works only in 64-bit Windows versions."


 ;------------------------------------
--- a/dist/windows/installer-translations/bulgarian.nsi
+++ b/dist/windows/installer-translations/bulgarian.nsi
@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_BULGARIAN} "A previous installation wa
 LangString inst_unist ${LANG_BULGARIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_BULGARIAN} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_BULGARIAN} "This installer works only in 64-bit Windows versions."


 ;------------------------------------
--- a/dist/windows/installer-translations/catalan.nsi
+++ b/dist/windows/installer-translations/catalan.nsi
@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_CATALAN} "A previous installation was
 LangString inst_unist ${LANG_CATALAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_CATALAN} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_CATALAN} "This installer works only in 64-bit Windows versions."


 ;------------------------------------
--- a/dist/windows/installer-translations/croatian.nsi
+++ b/dist/windows/installer-translations/croatian.nsi
@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_CROATIAN} "A previous installation was
 LangString inst_unist ${LANG_CROATIAN} "Deinstaliraj prethodnu verziju."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_CROATIAN} "Pokreni qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_CROATIAN} "This installer works only in 64-bit Windows versions."


 ;------------------------------------
--- a/dist/windows/installer-translations/czech.nsi
+++ b/dist/windows/installer-translations/czech.nsi
@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_CZECH} "A previous installation was de
 LangString inst_unist ${LANG_CZECH} "Odebírání předchozí verze."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_CZECH} "Spustit qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_CZECH} "This installer works only in 64-bit Windows versions."


 ;------------------------------------
--- a/dist/windows/installer-translations/danish.nsi
+++ b/dist/windows/installer-translations/danish.nsi
@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_DANISH} "A previous installation was d
 LangString inst_unist ${LANG_DANISH} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_DANISH} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_DANISH} "This installer works only in 64-bit Windows versions."


 ;------------------------------------
--- a/dist/windows/installer-translations/dutch.nsi
+++ b/dist/windows/installer-translations/dutch.nsi
@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_DUTCH} "A previous installation was de
 LangString inst_unist ${LANG_DUTCH} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_DUTCH} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_DUTCH} "This installer works only in 64-bit Windows versions."


 ;------------------------------------
--- a/dist/windows/installer-translations/english.nsi
+++ b/dist/windows/installer-translations/english.nsi
@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was
 LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."


 ;------------------------------------
--- a/dist/windows/installer-translations/esperanto.nsi
+++ b/dist/windows/installer-translations/esperanto.nsi
@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_ESPERANTO} "A previous installation wa
 LangString inst_unist ${LANG_ESPERANTO} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_ESPERANTO} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_ESPERANTO} "This installer works only in 64-bit Windows versions."


 ;------------------------------------
--- a/dist/windows/installer-translations/estonian.nsi
+++ b/dist/windows/installer-translations/estonian.nsi
@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_ESTONIAN} "A previous installation was
 LangString inst_unist ${LANG_ESTONIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_ESTONIAN} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_ESTONIAN} "This installer works only in 64-bit Windows versions."


 ;------------------------------------
--- a/dist/windows/installer-translations/farsi.nsi
+++ b/dist/windows/installer-translations/farsi.nsi
@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_FARSI} "A previous installation was de
 LangString inst_unist ${LANG_FARSI} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_FARSI} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_FARSI} "This installer works only in 64-bit Windows versions."


 ;------------------------------------
--- a/dist/windows/installer-translations/finnish.nsi
+++ b/dist/windows/installer-translations/finnish.nsi
@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_FINNISH} "A previous installation was
 LangString inst_unist ${LANG_FINNISH} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_FINNISH} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_FINNISH} "This installer works only in 64-bit Windows versions."


 ;------------------------------------
--- a/dist/windows/installer-translations/french.nsi
+++ b/dist/windows/installer-translations/french.nsi
@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_FRENCH} "Une installation précédente
 LangString inst_unist ${LANG_FRENCH} "Désinstallation de la version précédente."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_FRENCH} "Lancer qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_FRENCH} "Cet installateur ne fonctionne que dans les versions 64 bits de Windows."


 ;------------------------------------
--- a/dist/windows/installer-translations/galician.nsi
+++ b/dist/windows/installer-translations/galician.nsi
@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_GALICIAN} "A previous installation was
 LangString inst_unist ${LANG_GALICIAN} "Desinstalando a versión anterior."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_GALICIAN} "Iniciar qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_GALICIAN} "This installer works only in 64-bit Windows versions."


 ;------------------------------------
--- a/dist/windows/installer-translations/german.nsi
+++ b/dist/windows/installer-translations/german.nsi
@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_GERMAN} "Eine ältere Installation wur
 LangString inst_unist ${LANG_GERMAN} "Vorherige Version wird deinstalliert."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_GERMAN} "Starte qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_GERMAN} "This installer works only in 64-bit Windows versions."


 ;------------------------------------
--- a/dist/windows/installer-translations/greek.nsi
+++ b/dist/windows/installer-translations/greek.nsi
@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_GREEK} "A previous installation was de
 LangString inst_unist ${LANG_GREEK} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_GREEK} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_GREEK} "This installer works only in 64-bit Windows versions."


 ;------------------------------------
--- a/dist/windows/installer-translations/hebrew.nsi
+++ b/dist/windows/installer-translations/hebrew.nsi
@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_HEBREW} "A previous installation was d
 LangString inst_unist ${LANG_HEBREW} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_HEBREW} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_HEBREW} "This installer works only in 64-bit Windows versions."


 ;------------------------------------
--- a/dist/windows/installer-translations/hungarian.nsi
+++ b/dist/windows/installer-translations/hungarian.nsi
@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_HUNGARIAN} "A previous installation wa
 LangString inst_unist ${LANG_HUNGARIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_HUNGARIAN} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_HUNGARIAN} "This installer works only in 64-bit Windows versions."


 ;------------------------------------
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
sledgehammer999	258efe261d	Bump to 3.3.12	2017-04-06 19:51:12 +03:00
sledgehammer999	59abbab9b9	Update Changelog.	2017-04-06 19:48:23 +03:00
Chocobo1	7cc32cbe97	Bump _WIN32_IE in cmake build	2017-04-06 19:47:21 +03:00
Chocobo1	5783f7bafe	Fix NTDDI_VERSION define Fixup of `5958585e3a`	2017-04-06 19:47:08 +03:00
sledgehammer999	0e64e6887a	Bump API_VERSION and API_VERSION_MIN to 13.	2017-04-06 02:04:31 +03:00
sledgehammer999	c25cb29e61	Sync translations of .desktop file from Transifex.	2017-04-06 02:04:29 +03:00
sledgehammer999	bca9b60db8	Revert "Refactor: initialize class variable directly" This reverts commit `b4bca7cfb7`.	2017-04-06 00:43:03 +03:00
Chocobo1	1ec122c4ab	Set cookie SID value to empty on logout Set cookie SID expiration date to 1 day in the past on logout	2017-04-05 18:40:53 +03:00
Chocobo1	562dd41ab2	Fire up the timer to clean inactive sessions	2017-04-05 18:40:52 +03:00
Chocobo1	b4bca7cfb7	Refactor: initialize class variable directly	2017-04-05 18:40:51 +03:00
Chocobo1	b985bb43fa	Refactor: reorder headers	2017-04-05 18:40:50 +03:00
Chocobo1	bf8a438a6f	Set HttpOnly attribute to SID cookie	2017-04-05 18:40:48 +03:00
vlakoff	7cd9b6f750	Update French translation for the installer	2017-04-05 18:40:41 +03:00
sledgehammer999	d487c69dcc	Fix running the uninstaller if the user chose a different path in the installer. Closes #6080 .	2017-04-05 03:05:46 +03:00
sledgehammer999	444c2bdf19	Revert "Use Perl-compatible regexes for RSS rules. Closes #6367." This reverts commit `8d11af94f2`.	2017-04-04 03:25:27 +03:00
sledgehammer999	f86064e322	Revert "Cache rule regular expressions for performance" This reverts commit `bacef1ca24`.	2017-04-04 03:25:24 +03:00
sledgehammer999	6675544c23	Revert "Change named of getter function." This reverts commit `20b30dd4b5`.	2017-04-04 03:25:14 +03:00
FranciscoPombal	10205ca67e	fixed "remaining" column in WebUI the key had the wrong name. In the js code, the expected key is "amount_left" and not "remaining".	2017-04-04 02:04:36 +03:00
sledgehammer999	2dfed3c41e	Better 64-bit handling in the installer.	2017-04-04 02:04:35 +03:00
Eugene Shalygin	db29a61fbf	cmake: fix OSX bundle creation	2017-04-04 02:04:33 +03:00
Chocobo1	3497c5307c	Fix cancel "Set location" causes files move to installation dir. Closes #6568.	2017-04-04 02:04:32 +03:00
Chocobo1	565f263ecb	Add log message	2017-04-04 02:04:31 +03:00
Chocobo1	c94a61f434	code formatting	2017-04-04 02:04:30 +03:00
Chocobo1	d390d941eb	Add NTDDI_VERSION define	2017-04-04 02:04:29 +03:00
Chocobo1	f1de249c9e	NSIS: set exit code to 0 on install/uninstall success Closes #6129.	2017-04-04 02:04:28 +03:00
Chocobo1	f85768412c	NSIS: trim whitespaces	2017-04-04 02:04:26 +03:00
regs01	5a28e8c5e9	Update options.nsi dpi-aware installer	2017-04-04 02:04:25 +03:00
epicgirl1998	5b72595547	Remove extra space fixes https://github.com/qbittorrent/qBittorrent/issues/6523	2017-04-04 02:04:24 +03:00
sheeit	a363ed6d7c	Fixed Markdown formatting for headers	2017-04-04 02:04:23 +03:00
sledgehammer999	077469d5a0	Indicate bitness in stackstrace and about dialog. Closes #6172 .	2017-04-04 01:54:37 +03:00
sledgehammer999	66df7c47b2	Some improvements in travis.yml for macOS. Closes #6089 .	2017-04-04 01:54:18 +03:00
sledgehammer999	20b30dd4b5	Change named of getter function.	2017-04-04 01:54:17 +03:00
Tim Delaney	bacef1ca24	Cache rule regular expressions for performance --HG-- branch : magao-dev	2017-04-04 01:54:16 +03:00
Tim Delaney	8d11af94f2	Use Perl-compatible regexes for RSS rules. Closes #6367 . --HG-- branch : magao-dev	2017-04-04 01:52:02 +03:00
sledgehammer999	02c96fa5e2	Change the user-agent format in the session.cpp too.	2017-04-04 01:48:43 +03:00
Chocobo1	65b491fed0	Add comment	2017-04-04 01:48:41 +03:00
Chocobo1	f0eab3f085	Follow http user-agent format Add version variable without the starting "v"	2017-04-04 01:48:27 +03:00
Chocobo1	21212fdfe5	Prepend QBT_ for preprocessor variables	2017-04-04 01:48:26 +03:00
FranciscoPombal	f39465c25a	Implement statistics window in web UI	2017-04-04 01:48:25 +03:00
Vladimir Golovnev (Glassez)	a3eaee7e7e	Remove exception-suppress macros Remove SAFE_* macros from TorrentHandle class. These macros using seems to be unneeded.	2017-04-04 01:48:03 +03:00
sledgehammer999	1e28bbb47e	Revert "Set default locale". Closes #6436 and #6459 . This reverts commit `75ef6356d3`.	2017-04-04 01:48:02 +03:00
sledgehammer999	c5b98339ae	Update stuff in appdata.xml and run 'appstream-utl upgrade' on it.	2017-04-04 01:48:01 +03:00
sledgehammer999	edb1b727c6	Add keywords to the .desktop file.	2017-04-04 01:47:38 +03:00
Chocobo1	78aeb5eee7	Capitalize title strings Remove DISCARDABLE keyword which is ignored on 32-bit windows	2017-04-04 01:47:37 +03:00
Chocobo1	9dd93c3d17	Embed manifest when compiling with MSVC Update manifest	2017-04-04 01:47:25 +03:00
buinsky	2d64405eb8	Improve performance of updating 'progress' column	2017-03-05 18:47:50 +02:00
Chocobo1	dff560d8c2	Workaround thread_local not supported on OSX Drop back to xcode7.3 on TravisCI	2017-03-05 18:47:49 +02:00
Chocobo1	b3c973612f	Fix compile error: ‘escape’ is not a member of ‘Qt’	2017-03-05 18:47:48 +02:00
Chocobo1	3480d3d10c	Fix incomplete type compile error with Qt4	2017-03-05 18:47:47 +02:00
Chocobo1	f45d21d3a2	Enable thread_local support in TravisCI	2017-03-05 18:47:46 +02:00
Chocobo1	8dcb792ac0	Replace rand() by a true uniform distribution generator	2017-03-05 18:47:37 +02:00