Bump to 3.3.12

Fixup of 5958585e3a

.appveyor.yml

@@ -9,8 +9,8 @@ environment:
   REPO_DIR: &REPO_DIR c:\qbittorrent
   CACHE_DIR: &CACHE_DIR c:\qbt_cache
 
-  QBT_VER_URL: http://builds.shiki.hu/appveyor/version
+  QBT_VER_URL: https://builds.shiki.hu/appveyor/version
-  QBT_LIB_URL: http://builds.shiki.hu/appveyor/qbt_libraries.7z
+  QBT_LIB_URL: https://builds.shiki.hu/appveyor/qbt_libraries.7z
 
 # project directory
 clone_folder: *REPO_DIR

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,14 @@
+**Please provide the following information**
+
+### qBittorrent version and Operating System:
+
+### If on linux, libtorrent and Qt version:
+
+### What is the problem:
+
+### What is the expected behavior:
+
+### Steps to reproduce:
+
+### Extra info(if any):
+

.travis.yml

@@ -3,7 +3,7 @@ language: cpp
 os:
   - linux
   - osx
-osx_image: xcode7
+osx_image: xcode7.3
 
 env:
   matrix:
@@ -17,6 +17,12 @@ env:
   global:
     - secure: "OI9CUjj4lTb0HwwIZU5PbECU3hLlAL6KC8KsbwohG8/O3j5fLcnmDsK4Ad9us5cC39sS11Jcd1kDP2qRcCuST/glVNhLkcjKkiQerOfd5nQ/qL4JYfz/1mfP5mdpz9jHKzpLUIG+TXkbSTjP6VVmsb5KPT+3pKEdRFZB+Pu9+J8="
     - coverity_branch: coverity_scan
+matrix:
+  allow_failures:
+    - os: osx
+      env: lt_branch=RC_1_0 qt=4 gui=true
+    - os: osx
+      env: lt_branch=RC_1_0 qt=4 gui=false
 
 branches:
   except:
@@ -30,7 +36,10 @@ notifications:
 
 # container-based builds
 #sudo: false
-cache: ccache
+cache:
+  ccache: true
+  directories:
+    - $HOME/hombebrew_cache
 
 # opt-in Ubuntu Trusty
 sudo: required
@@ -80,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
@@ -117,12 +122,40 @@ install:
     fi
   - |
     if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+      wget https://builds.shiki.hu/homebrew/version ;
+      if ! cmp --quiet "version" "$HOME/hombebrew_cache/version" ; then
+        echo "Cached files are different from server. Downloading new ones." ;
+        # First delete old files
+        rm -r "$HOME/hombebrew_cache" ;
+        mkdir "$HOME/hombebrew_cache";
+        cp "version" $HOME/hombebrew_cache ;
+        cd "$HOME/hombebrew_cache" ;
+        wget https://builds.shiki.hu/homebrew/libtorrent-rasterbar.rb ;
+        wget https://builds.shiki.hu/homebrew/libtorrent-rasterbar-1.0.10.el_capitan.bottle.tar.gz ;
+        wget https://builds.shiki.hu/homebrew/qt5.rb ;
+        wget https://builds.shiki.hu/homebrew/qt5-5.7.1_1.el_capitan.bottle.tar.gz ;
+      fi
+
       # dependencies
-      brew update > /dev/null && brew install colormake ccache libtorrent-rasterbar ;
+      brew update > /dev/null ;
+      brew install colormake ccache ;
+      brew outdated "pkg-config" || brew upgrade "pkg-config" ;
+      # Copy custom libtorrent bottle to homebrew's cache so it can find and install it
+      # Also install our custom libtorrent formula by passing the local path to it
+      # These 2 files are restored from Travis' cache.
+      cp "$HOME/hombebrew_cache/libtorrent-rasterbar-1.0.10.el_capitan.bottle.tar.gz" "$(brew --cache)" ;
+      brew install "$HOME/hombebrew_cache/libtorrent-rasterbar.rb" ;
 
       # Qt
       if [ "$qt" = 4 ]; then brew install qt && ln -s /usr/local/Cellar/qt/4.8.7_2/plugins /usr/local ; fi ;
-      if [ "$qt" = 5 ]; then brew install qt5 && brew link --force qt5 && ln -s /usr/local/Cellar/qt5/5.6.0/plugins /usr/local ; fi ;
+      if [ "$qt" = 5 ]; then
+        # Copy custom qt5 bottle to homebrew's cache so it can find and install it
+        # Also install our custom qt5 formula by passing the local path to it
+        # These 2 files are restored from Travis' cache.
+        cp "$HOME/hombebrew_cache/qt5-5.7.1_1.el_capitan.bottle.tar.gz" "$(brew --cache)" ;
+        brew install "$HOME/hombebrew_cache/qt5.rb" ;
+        brew link --force qt5 ;
+      fi
 
       # ccache
       if [ "$TRAVIS_BRANCH" != "$coverity_branch" ]; then
@@ -145,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:

5B7CC9A2.asc

@@ -26,28 +26,67 @@ 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
-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
+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
-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
+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
-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
+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
-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
+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
-+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
+zJcJf4CH+VGE23xkI3Kf0nGp9Cjn/q6b1hLIPe5rimvw5pTAejFtebcYY/ZJIB8Z
-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
+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
-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
+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
-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
+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
-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
+DIs6KIurp2ve7znKOz7h1aX8cOBmB/QYeYAx9jRRkePMIRT8V1lRwfvJlJxx1+G3
-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
+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
-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
+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
-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
+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
-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
+jUu9MoVEw5Lbjcrsnp6/4Kk1Q2ckBNt43nv8/+C7NsC3xi6BrOInuaKHZ4QsTuzJ
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+f4saJ0TnXNe7goPRZtH7UjPwfVbtYK4y8QklWUTRxgoBxNwSC5X7Flg+3xXxE/VU
-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
+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
-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
+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
-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
+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
-=tDGM
+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
+xdpwp07LYo2ilhMI8RnzmtoRmg==
+=UBeB
 -----END PGP PUBLIC KEY BLOCK-----

CMakeLists.txt

@@ -1,15 +1,14 @@
 cmake_minimum_required(VERSION 3.5)
 cmake_policy(VERSION 3.5)
 
-project(qBittorrent VERSION 3.4.0.0)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
+include(FunctionReadVersion)
 
-set(VER_MAJOR ${qBittorrent_VERSION_MAJOR})
+read_version("${CMAKE_CURRENT_SOURCE_DIR}/version.pri" VER_MAJOR VER_MINOR VER_BUGFIX VER_BUILD VER_STATUS)
-set(VER_MINOR ${qBittorrent_VERSION_MINOR})
+# message(STATUS "Project version is: ${VER_MAJOR}.${VER_MINOR}.${VER_BUGFIX}.${VER_BUILD} (${VER_STATUS})")
-set(VER_BUGFIX ${qBittorrent_VERSION_PATCH})
+
-set(VER_BUILD ${qBittorrent_VERSION_TWEAK})
+project(qBittorrent VERSION ${VER_MAJOR}.${VER_MINOR}.${VER_BUGFIX}.${VER_BUILD})
-set(VER_STATUS "alpha") # Should be empty for stable releases!
 
-# Don't touch the rest part
 set(PROJECT_VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_BUGFIX}")
 
 if (NOT VER_BUILD EQUAL 0)
@@ -18,17 +17,18 @@ endif()
 
 set(PROJECT_VERSION "${PROJECT_VERSION}${VER_STATUS}")
 
-add_definitions(-DVERSION_MAJOR=${VER_MAJOR})
+add_definitions(-DQBT_VERSION_MAJOR=${VER_MAJOR})
-add_definitions(-DVERSION_MINOR=${VER_MINOR})
+add_definitions(-DQBT_VERSION_MINOR=${VER_MINOR})
-add_definitions(-DVERSION_BUGFIX=${VER_BUGFIX})
+add_definitions(-DQBT_VERSION_BUGFIX=${VER_BUGFIX})
-add_definitions(-DVERSION_BUILD=${VER_BUILD})
+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}")
 # }
-list(APPEND CMAKE_MODULE_PATH ${qBittorrent_SOURCE_DIR}/cmake/Modules)
 
 # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Og")
 if (UNIX AND NOT APPLE)

Changelog

@@ -1,3 +1,171 @@
+* 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)
+    - FEATURE: Remove settings to exchange trackers. It wasn't used by non-libtorrent clients. Also it has a privacy risk and you might be DDoSing someone. (sledgehammer999)
+    - FEATURE: Put temp files in .qBittorrent directory. Closes #4462. (Chocobo1)
+    - FEATURE: Use the numbers from tracker scrape response. Closes #5048, #6117. (Chocobo1)
+    - FEATURE: Implement category filter widget. Show categories in tree mode when subcategories are enabled. (glassez)
+    - FEATURE: Allow to toggle columns in searchtab (thalieht)
+    - FEATURE: PeerList: allow to hide zero values for the "uploaded" and "downloaded" columns (thalieht)
+    - FEATURE: Display more information in tracker tab (ngosang)
+    - FEATURE: Use Ctrl+F to search torrents. Closes #5797. (Tim Delaney)
+    - FEATURE: Transferlist: add hotkeys for double click and recheck selected torrents (thalieht)
+    - FEATURE: Add hotkey for execution log tab, Trackerlist, Peerlist etc (thalieht)
+    - FEATURE: Seperate seeds from peers for DHT, PeX and LSD (thalieht)
+    - BUGFIX: Do not remove added files unconditionally. Closes #6248 (Eugene Shalygin)
+    - BUGFIX: Ignore mouse wheel events in Advanced Settings. Closes #866. (Chocobo1)
+    - BUGFIX: Add queue repair code. It should fix missing torrents after restarting. (Eugene Shalygin, nxd4)
+    - BUGFIX: Fetch torrent status when generating final fastresume data. It should fix missing torrents after restarting. (Eugene Shalygin)
+    - BUGFIX: Fix queue overload for add torrent at session start. It should fix missing torrents after restarting. (falco)
+    - BUGFIX: After files relocate, don't remove the old folder even if it is empty. (Chocobo1)
+    - BUGFIX: Fix finding 'English' item in language dropdown menu when an unrecognized locale is requested. Closes #6109. (sledgehammer999)
+    - BUGIFX: Speedlimitdlg: raise slider default value to 10000. Closes #6150. (Chocobo1)
+    - BUGFIX: TransferListWidget: keep columns width even if they are hidden on qBittorrent startup (unless something goes wrong) (thalieht)
+    - BUGFIX: fix index overflow for torrents with invalid meta data or empty progress (Falco)
+    - BUGFIX: Immediately update torrent_status after manipulating super seeding mode. Partially fixes #6072. (sledgehammer999)
+    - BUGFIX: Use case-insensitive comparsion for torrent content window. Closes #6327. (Chocobo1)
+    - BUGFIX: Fixed sort order for datetime columns with empty values (closes #2988) (Vladimir Sinenko)
+    - BUGFIX: Disable proxy in WebUI HTTP server. Closes #6349. (Eugene Shalygin)
+    - COSMETIC: Use a disabled progressbar's palette for unselected files. (sledgehammer999)
+    - COSMETIC: Support fallback when selecting theme icons (Eugene Shalygin)
+    - COSMETIC: Do not resize SVG icons (Eugene Shalygin)
+    - COSMETIC: Align text to the right in columns that handle numbers for PeerList and SearchTab (thalieht)
+    - COSMETIC: Increased number of digits after the decimal point for Gibibytes and above (thalieht)
+    - COSMETIC: Use non-breaking spaces between numbers and units (thalieht)
+    - WEBUI: Fix proxy type bug (Oke Atime)
+    - WEBUI: Use the correct value for KEY_TORRENT_NUM_COMPLETE/KEY_TORRENT_NUM_INCOMPLETE (Chocobo1)
+    - WEBUI: Make torrents table scrollable horizontally (buinsky)
+    - WEBUI: Make torrent peers table scrollable horizontally (buinsky)
+    - WEBUI: Add tooltips to dynamic table header (buinsky)
+    - WEBUI: Implement dynamic table columns resizing, reordering and hiding (buinsky)
+    - WEBUI: Add some missing columns to dynamic tables (buinsky)
+    - WEBUI: Make too tall menus scrollable (buinksy)
+    - WEBUI: Prevent text wrapping in menus (buinsky)
+    - WEBUI: Add a vertical separator between columns (buinsky)
+    - WEBUI: Implement resizable progress bar in "Done" column (buinsky)
+    - WEBUI: Fix scrollbar covers menu item with long text (buinsky)
+    - WEBUI: Remove 300px limit of column width (buinsky)
+    - WEBUI: Avoid lags in firefox on resizing progress column (buinsky)
+    - WEBUI: Fix category in torrent upload. Closes #6260 (ngosang)
+    - WEBUI: Turn off port forwarding of WebUI by default for GUI users (Chocobo1)
+    - WEBUI: Exclude insecure ciphers. Fixes security issues reported by @beardog108 privately. (Chocobo1)
+    - WEBUI: Avoid clickjacking attacks. Fixes security issues reported by @beardog108 privately. (ngosang)
+    - WEBUI: Add X-XSS-Protection, X-Content-Type-Options, CSP header. Fixes security issues reported by @beardog108 privately. (Chocobo1)
+    - WEBUI: Escape various values that might contain injected html. Fixes security issues reported by @beardog108 privately. (Chocobo1)
+    - WEBUI: Bump API_VERSION to 12.
+    - SEARCH: Update extratorrent plugin. Closes #6261 (ngosang)
+    - SEARCH: SearchTab: can now save sorting column changes (thalieht)
+    - SEARCH: Use case-insensitive sort for Name column in Search tab. Closes #407. (Chocobo1)
+    - RSS: Fix tab order in RSS downloader. Closes #6164. (Tim Delaney)
+    - RSS: Move old RSS items to separate config file. Closes #6167. (Tim Delaney)
+    - RSS: Episode filter code refactoring (Tim Delaney)
+    - RSS: Allow resetting rule to no category. Closes #5539. (Tim Delaney)
+    - RSS: Save rule on enable/disable even if not selected. Closes #6163. (Tim Delaney)
+    - RSS: Allow | in RSS must contain. Closes #6171. (Tim Delaney)
+    - RSS: RSS use red text to indicate invalid filter. Closes #6165. (Tim Delaney)
+    - RSS: Allow episode zero (special) and leading zeroes in RSS episode filter. (Tim Delaney)
+    - RSS: RSS parse torrent episodes like 1x01 as well as S01E01. Closes #2749. (Tim Delaney)
+    - RSS: RSS allow infinite range to extend beyond current season. Closes #800, #3876, #6170. (Tim Delaney)
+    - RSS: Improve UI responsiveness during RSS downloading. Closes #873, #1089, #1235, #5423. (Tim Delaney)
+    - RSS: Show name of feed list and sort rules in editor. Closes #3782, #6281. (Tim Delaney)
+    - RSS: Fix regex matching. Closes #6337. (Tim Delaney)
+    - MACOS: Fix qbittorrent-nox build (Oke Atime)
+    - LINUX: fixes default indicator name (Bilal Elmoussaoui)
+    - OTHER: Workaround problem with moc from Qt4 and #if (Eugene Shalygin)
+    - OTHER: Print warning to the user if stacktrace contains no function names (Eugene Shalygin)
+    - OTHER: Various cmake fixes (Eugene Shalygin)
+    - OTHER: Fix finding qmake in configure when cross-compiling (Zach Bacon)
+
+* Sat Dec 17 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.10
+    - BUGFIX: Fix share ratio limiting. Broken by commit 259b5e51c49b744. Closes #6039 #6048. (sledgehammer999)
+    - BUGFIX: Case insensitive sort for client column. Closes #6054. (Oke Atime)
+    - BUGFIX: Make resume/pause menu items clickable. Closes #6040. (Oke Atime)
+    - WINDOWS: Make the updater to look for the x64 installer if running x64 version. (sledgehammer999)
+
+* Wed Dec 14 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.9
+    - BUGFIX: Fix slider for per torrent speed limits when no global speed limit has been set. Closes #6046. (sledgehammer999)
+    - BUGFIX: Fix GUI for proxy settings. Closes #6045. (sledgehammer999)
+    - OSX: Correctly migrate settings/rss/usage stats in macOS. Closes #6041. (sledgehammer999)
+
+* Wed Dec 14 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.8
+    - FEATURE: Start using new libtorrent 1.1.x APIs (needs at least 1.1.2). Still unofficial support. (glassez, sledgehammer999)
+    - FEATURE: Add a new DHT bootstrap node run by libtorrent author arvidn. (sledgehammer999)
+    - FEATURE: Option to disable tracker's favicon download. (sledgehammer999)
+    - FEATURE: Shift + scroll = horizontal scroll. Closes #5980. Only for TransferListWidget, PeerListWidget. (Chocobo1)
+    - BUGFIX: Actually set new path as default when checkBox is enabled in Add New Torrent dialog. (erikssm)
+    - BUGFIX: Properly fix the handling of default save path store/load. (sledgehammer999)
+    - BUGFIX: Fix crash when restoring from tray. Closes #5854. (Chocobo1)
+    - BUGFIX: Export torrents added only after the setting was enabled. (sledgehammer999)
+    - BUGFIX: Delete old rss favicon before assigning new one. (sledgehammer999)
+    - BUGFIX: Don't revert save path value in the Dialog when metadata are received. Closes #5482. (sledgehammer999)
+    - BUGFIX: Don't ever stop seeding forced torrents. Closes #5784. (sledgehammer999)
+    - BUGFIX: Fix potential crash in TransferList widget. Closes #5873. (Chocobo1)
+    - BUGFIX: Sort torrent names case insensitively. (Yez Ezey)
+    - BUGFIX: Fix mistake in getting values for sorting in TransferList widget. (Anton Lashkov)
+    - BUGFIX: Fix memory leaks. (dzmat, Chocobo1)
+    - WEBUI: Fix webui port overflow. (thalieht)
+    - WEBUI: Changed meaning of the value of the 'dl_limit', 'up_limit', 'alt_dl_limit' and 'alt_up_limit' tokens. The value is expressed in bytes and not in KiB. (sledgehammer999)
+    - WEBUI: Don't request client SSL certificate. Closes #3883. (borouhin)
+    - WEBUI: Bump API_VERSION and API_VERSION_MIN to 11.
+    - SEARCH: Fixed extratorrent search not working Closes #5736 #5753. (Yez Ezey)
+    - SEARCH: Update Demonoid plugin. (ngosang)
+    - SEARCH: Remove TorrentReactor plugin. (ngosang)
+    - SEARCH: Fix python auto install, deletion of installer and use 3.5.x series for Vista+. Closes #5871. (sledgehammer999)
+    - SEARCH: Set /usr/local/bin before default PATH on macOS. closes #5639 #5571. This enables finding newer python installs. (Yez Ezey)
+    - COSMETIC: Log: set embedded Tracker [OFF] msg type as info. (thalieht)
+    - COSMETIC: Remove (mostly) useless log warnings about tracker's favicon. (sledgehammer999)
+    - COSMETIC: Change RSS view layout to horizontal. Closes #5920. (Chocobo1)
+    - OSX: Fix crash on exit using Qt4. (Yez Ezey)
+    - OSX: Change QSettings to IniFormat on macOS. Closes #5770 #5808. (Yez Ezey)
+    - LINUX: Workaround a Qt5 bug which results in a flood of network interface change singals. (Eugene Shalygin)
+    - OTHER: Turkish translation for installer. (Burak Yavuz)
+    - OTHER: Update portugueseBR for installer. (DaRKSoM)
+    - OTHER: Update portuguese for installer. (EdwardLinux)
+    - OTHER: Add --disable-qt-dbus to configure if $host_os is macOS. (Yez Ezey)
+    - OTHER: New translations: Icelandic, Latvian, Malay, Occitan, Uzbek.
+    - OTHER: A whole lot of code refactoring by various people.
+
+* Sun Sep 11 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.7
+    - FEATURE: Delete torrent+files with Shift+Delete (pieniacy)
+    - BUGFIX: Fix 6-hour speedplot point push rate. Close #5545 (Daniel Segesdi)
+    - BUGFIX: Avoid spawning a new explorer.exe process when selecting "Open containing folder". Closes #5564. (Chocobo1)
+    - BUGFIX: Fix loading of new geoip db due to an artificial size limit. (SagePtr)
+    - BUGFIX: Better error handling and logging with smtp communication. (Brian Kendall)
+    - SEARCH: Remove KickassTorrents search engine (ngosang)
+    - SEARCH: Remove BTDigg search engine (ngosang)
+    - SEARCH: Update Torrentz search engine (ngosang)
+    
+* Wed Jul 20 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.6
+    - BUGFIX: Do not create save folder in advance (glassez)
+    - BUGFIX: Fix upper-bound limit of command line for "Run External Program" in Windows. Closes #5399. (Chocobo1)
+    - BUGFIX: Invoke system's cmd.exe directly. (Chocobo1)
+    - BUGFIX: Workaround space issues in file path for running external program on Windows. (Chocobo1)
+    - BUGFIX: Fix icons are missing when using RTL languages in Options dialog. Closes #5398. (Chocobo1)
+
 * Mon Jun 20 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.5
     - FEATURE: Implement Torrent Management Mode(TMM) (glassez)
     - FEATURE: New cookies management dialog and various related fixes (glassez)

cmake/Modules/FindLibtorrentRasterbar.cmake

@@ -14,6 +14,11 @@
 find_package(Threads REQUIRED)
 find_package(PkgConfig QUIET)
 
+macro(_detect_boost_components _outComponets librariesList)
+    string(REGEX MATCHALL "boost_[a-z_]+[-a-z]*" _boost_libraries "${librariesList}")
+    string(REGEX REPLACE "boost_([a-z_]+)[-a-z]*" "\\1" ${_outComponets} "${_boost_libraries}")
+endmacro()
+
 if(PKG_CONFIG_FOUND)
     pkg_check_modules(PC_LIBTORRENT_RASTERBAR QUIET libtorrent-rasterbar)
 endif()
@@ -62,13 +67,33 @@ endif()
 set(LibtorrentRasterbar_LIBRARIES ${LibtorrentRasterbar_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
 set(LibtorrentRasterbar_INCLUDE_DIRS ${LibtorrentRasterbar_INCLUDE_DIR})
 
-if(NOT Boost_SYSTEM_FOUND OR NOT Boost_CHRONO_FOUND OR NOT Boost_RANDOM_FOUND)
+# Without pkg-config, we can't possibly figure out the correct boost dependencies
-    find_package(Boost REQUIRED COMPONENTS date_time system chrono random thread)
+if (LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES)
-    set(LibtorrentRasterbar_LIBRARIES
+    set(_boost_components "${LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES}")
-        ${LibtorrentRasterbar_LIBRARIES} ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+else(LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES)
-    set(LibtorrentRasterbar_INCLUDE_DIRS
+    if(PC_LIBTORRENT_RASTERBAR_FOUND)
-        ${LibtorrentRasterbar_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
+        _detect_boost_components(_boost_components "${PC_LIBTORRENT_RASTERBAR_LIBRARIES}")
+    else()
+        # all possible boost dependencies
+        set(_boost_components
+            date_time
+            system
+            chrono
+            random
+            thread
+        )
     endif()
+endif(LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES)
+
+list(SORT _boost_components)
+message(STATUS "Libtorrent Boost dependencies: ${_boost_components}")
+find_package(Boost REQUIRED COMPONENTS ${_boost_components})
+set(LibtorrentRasterbar_LIBRARIES ${LibtorrentRasterbar_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+foreach(_boost_cmpnt IN LISTS _boost_components)
+    list(APPEND LibtorrentRasterbar_LIBRARIES "Boost::${_boost_cmpnt}")
+endforeach(_boost_cmpnt)
+
+set(LibtorrentRasterbar_INCLUDE_DIRS ${LibtorrentRasterbar_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
 
 list(FIND LibtorrentRasterbar_DEFINITIONS -DTORRENT_USE_OPENSSL LibtorrentRasterbar_ENCRYPTION_INDEX)
 if(LibtorrentRasterbar_ENCRYPTION_INDEX GREATER -1)
@@ -83,10 +108,7 @@ include(FindPackageHandleStandardArgs)
 # if all listed variables are TRUE
 find_package_handle_standard_args(LibtorrentRasterbar DEFAULT_MSG
                                   LibtorrentRasterbar_LIBRARY
-                                  LibtorrentRasterbar_INCLUDE_DIR
+                                  LibtorrentRasterbar_INCLUDE_DIR)
-                                  Boost_SYSTEM_FOUND
-                                  Boost_CHRONO_FOUND
-                                  Boost_RANDOM_FOUND)
 
 mark_as_advanced(LibtorrentRasterbar_INCLUDE_DIR LibtorrentRasterbar_LIBRARY
     LibtorrentRasterbar_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES

cmake/Modules/FunctionReadVersion.cmake

@@ -0,0 +1,28 @@
+# function for parsing version variables that are set in version.pri file
+# the version identifiers there are defined as follows:
+# VER_MAJOR = 3
+# VER_MINOR = 4
+# VER_BUGFIX = 0
+# VER_BUILD = 0
+# VER_STATUS = alpha
+
+function(read_version priFile outMajor outMinor outBugfix outBuild outStatus)
+    file(STRINGS ${priFile} _priFileContents REGEX "^VER_.+")
+    # message(STATUS "version.pri version contents: ${_priFileContents}")
+    # the _priFileContents variable contains something like the following:
+    # VER_MAJOR = 3;VER_MINOR = 4;VER_BUGFIX = 0;VER_BUILD = 0;VER_STATUS = alpha # Should be empty for stable releases!
+    set(_regex "VER_MAJOR += +([0-9]+);VER_MINOR += +([0-9]+);VER_BUGFIX += +([0-9]+);VER_BUILD += +([0-9]+);VER_STATUS += +([0-9A-Za-z]+)?")
+     # note quotes around _regex, they are needed because the variable contains semicolons
+    string(REGEX MATCH "${_regex}" _tmp "${_priFileContents}")
+    if (NOT _tmp)
+        message(FATAL_ERROR "Could not detect project version number from ${priFile}")
+    endif()
+
+    # message(STATUS "Matched version string: ${_tmp}")
+
+    set(${outMajor} ${CMAKE_MATCH_1} PARENT_SCOPE)
+    set(${outMinor} ${CMAKE_MATCH_2} PARENT_SCOPE)
+    set(${outBugfix} ${CMAKE_MATCH_3} PARENT_SCOPE)
+    set(${outBuild} ${CMAKE_MATCH_4} PARENT_SCOPE)
+    set(${outStatus} ${CMAKE_MATCH_5} PARENT_SCOPE)
+endfunction()

cmake/Modules/MacroLinkQtComponents.cmake

@@ -5,11 +5,23 @@
 macro (target_link_qt_components target)
 if (QT4_FOUND)
     foreach(_cmp ${ARGN})
+        if ("${_cmp}" STREQUAL "PRIVATE" OR
+            "${_cmp}" STREQUAL "PUBLIC" OR
+            "${_cmp}" STREQUAL "INTERFACE")
+             list(APPEND _QT_CMPNTS "${_cmp}")
+        else()
             list(APPEND _QT_CMPNTS "Qt4::Qt${_cmp}")
+        endif()
     endforeach()
 else (QT4_FOUND)
     foreach(_cmp ${ARGN})
+        if ("${_cmp}" STREQUAL "PRIVATE" OR
+            "${_cmp}" STREQUAL "PUBLIC" OR
+            "${_cmp}" STREQUAL "INTERFACE")
+             list(APPEND _QT_CMPNTS "${_cmp}")
+        else()
             list(APPEND _QT_CMPNTS "Qt5::${_cmp}")
+        endif()
     endforeach()
 endif (QT4_FOUND)
     target_link_libraries(${target} ${_QT_CMPNTS})

cmake/Modules/winconf.cmake

@@ -9,18 +9,20 @@ set(LibtorrentRasterbar_CUSTOM_DEFINITIONS
     -DBOOST_EXCEPTION_DISABLE
     -DBOOST_SYSTEM_STATIC_LINK=1
     -DTORRENT_USE_OPENSSL
-    -DUNICODE
+    -D__USE_W32_SOCKETS
+    -D_FILE_OFFSET_BITS=64)
+
+add_definitions(-DUNICODE
     -D_UNICODE
     -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
-    -D__USE_W32_SOCKETS
+)
-    -D_FILE_OFFSET_BITS=64)
-
 # and boost
 set(Boost_USE_STATIC_LIBS  True)
 # set(Boost_USE_STATIC_RUNTIME True)
@@ -29,16 +31,17 @@ set(Boost_USE_STATIC_LIBS  True)
 # with usual unix subdirectories (bin, lib, include)
 # if so, we just need to set CMAKE_SYSTEM_PREFIX_PATH
 # If it is not the case, individual paths need to be specified manually (see below)
-set(COMMON_INSTALL_PREFIX "c:/usr")
+set(COMMON_INSTALL_PREFIX "c:/usr" CACHE PATH "Prefix used to install all the required libraries")
 list(APPEND CMAKE_SYSTEM_PREFIX_PATH "${COMMON_INSTALL_PREFIX}")
 
 # If two version of Qt are installed, separate prefixes are needed most likely
-set(QT4_INSTALL_PREFIX "${COMMON_INSTALL_PREFIX}/lib/qt4")
+set(QT4_INSTALL_PREFIX "${COMMON_INSTALL_PREFIX}/lib/qt4" CACHE PATH "Prefix where Qt4 is installed")
-set(QT5_INSTALL_PREFIX "${COMMON_INSTALL_PREFIX}/lib/qt5")
+set(QT5_INSTALL_PREFIX "${COMMON_INSTALL_PREFIX}/lib/qt5" CACHE PATH "Prefix where Qt5 is installed")
 
 # it is safe to set Qt dirs even if their files are directly in the prefix
 # Qt4
 if(NOT QT5)
+    # for qt 4 we need qmake, Qt5 provides cmake config files
     LIST(APPEND CMAKE_PROGRAM_PATH  "${QT4_INSTALL_PREFIX}/bin/")
 endif(NOT QT5)
 

conf.pri.in

@@ -9,6 +9,8 @@ QMAKE_CXXFLAGS += @QBT_CONF_EXTRA_CFLAGS@
 
 EXTERNAL_INCLUDES = @QBT_CONF_INCLUDES@
 EXTERNAL_INCLUDES -= $$QMAKE_DEFAULT_INCDIRS
+# added /usr/local/include due to Qt 5.7.0 bug on macOS
+macx: EXTERNAL_INCLUDES += "/usr/local/include"
 INCLUDEPATH += $$EXTERNAL_INCLUDES
 
 EXTERNAL_LIBS = @LDFLAGS@ @LIBS@

configure

@@ -4257,6 +4257,17 @@ else
 $as_echo "no" >&6; }
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OS is macOS" >&5
+$as_echo_n "checking whether OS is macOS... " >&6; }
+if expr "$host_os" : ".*darwin.*" > /dev/null; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      enable_qt_dbus=no
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
 # Require 0.23 pkg-config
 
 
@@ -4493,53 +4504,17 @@ fi
 
 fi
 
-as_ac_File=`$as_echo "ac_cv_file_$QT_QMAKE/qmake" | $as_tr_sh`
+if test -f "$QT_QMAKE/qmake"; then :
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $QT_QMAKE/qmake" >&5
-$as_echo_n "checking for $QT_QMAKE/qmake... " >&6; }
-if eval \${$as_ac_File+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$QT_QMAKE/qmake"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
   QT_QMAKE="$QT_QMAKE/qmake"
 else
-  as_ac_File=`$as_echo "ac_cv_file_$QT_QMAKE/qmake-qt5" | $as_tr_sh`
+  if test -f "$QT_QMAKE/qmake-qt5"; then :
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $QT_QMAKE/qmake-qt5" >&5
-$as_echo_n "checking for $QT_QMAKE/qmake-qt5... " >&6; }
-if eval \${$as_ac_File+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$QT_QMAKE/qmake-qt5"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
   QT_QMAKE="$QT_QMAKE/qmake-qt5"
 else
   QT_QMAKE=""
 fi
 
-
 fi
 
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt5 qmake >= 5.2.0" >&5
 $as_echo_n "checking for Qt5 qmake >= 5.2.0... " >&6; }
 if test "x$QT_QMAKE" != "x"; then :
@@ -4610,53 +4585,17 @@ fi
 
 fi
 
-as_ac_File=`$as_echo "ac_cv_file_$QT_QMAKE/qmake" | $as_tr_sh`
+if test -f "$QT_QMAKE/qmake"; then :
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $QT_QMAKE/qmake" >&5
-$as_echo_n "checking for $QT_QMAKE/qmake... " >&6; }
-if eval \${$as_ac_File+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$QT_QMAKE/qmake"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
   QT_QMAKE="$QT_QMAKE/qmake"
 else
-  as_ac_File=`$as_echo "ac_cv_file_$QT_QMAKE/qmake-qt4" | $as_tr_sh`
+  if test -f "$QT_QMAKE/qmake-qt4"; then :
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $QT_QMAKE/qmake-qt4" >&5
-$as_echo_n "checking for $QT_QMAKE/qmake-qt4... " >&6; }
-if eval \${$as_ac_File+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "$QT_QMAKE/qmake-qt4"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-eval ac_res=\$$as_ac_File
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
   QT_QMAKE="$QT_QMAKE/qmake-qt4"
 else
   QT_QMAKE=""
 fi
 
-
 fi
 
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt4 qmake >= 4.8.0" >&5
 $as_echo_n "checking for Qt4 qmake >= 4.8.0... " >&6; }
 if test "x$QT_QMAKE" != "x"; then :
@@ -5033,8 +4972,8 @@ fi
 if test "x$BOOST_CPPFLAGS" = "x"; then :
   as_fn_error $? "Could not find Boost" "$LINENO" 5
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: Boost CPPFLGAS: $BOOST_CPPFLAGS" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Boost CPPFLAGS: $BOOST_CPPFLAGS" >&5
-$as_echo "$as_me: Boost CPPFLGAS: $BOOST_CPPFLAGS" >&6;}
+$as_echo "$as_me: Boost CPPFLAGS: $BOOST_CPPFLAGS" >&6;}
       CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
       LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"
 fi
@@ -5083,6 +5022,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 			 CXXFLAGS_SAVE=$CXXFLAGS
+			 CXXFLAGS=
 
 			 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5090,7 +5030,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 int
 main ()
 {
-boost::system::system_category
+boost::system::error_category *a = 0;
   ;
   return 0;
 }

configure.ac

@@ -67,6 +67,12 @@ AS_IF([expr "$host_os" : ".*freebsd.*" > /dev/null],
       LIBS="-lexecinfo $LIBS"],
       [AC_MSG_RESULT([no])])
 
+AC_MSG_CHECKING([whether OS is macOS])
+AS_IF([expr "$host_os" : ".*darwin.*" > /dev/null],
+      [AC_MSG_RESULT([yes])
+      enable_qt_dbus=no],
+      [AC_MSG_RESULT([no])])
+
 # Require 0.23 pkg-config
 PKG_PROG_PKG_CONFIG([0.23])
 AS_IF([test "x$PKG_CONFIG" = "x"],
@@ -156,7 +162,7 @@ AX_BOOST_BASE([1.35])
 # how to test for a set vs unset variable.
 AS_IF([test "x$BOOST_CPPFLAGS" = "x"],
       [AC_MSG_ERROR([Could not find Boost])],
-      [AC_MSG_NOTICE([Boost CPPFLGAS: $BOOST_CPPFLAGS])
+      [AC_MSG_NOTICE([Boost CPPFLAGS: $BOOST_CPPFLAGS])
       CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
       LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"])
 

dist/mac/Info.plist

@@ -37,7 +37,7 @@
 		</dict>
 	</array>
 	<key>CFBundleName</key>
-	<string>qBittorrent</string>
+	<string>@EXECUTABLE@</string>
 	<key>CFBundleIconFile</key>
 	<string>qbittorrent_mac.icns</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -45,11 +45,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.3.5</string>
+	<string>3.3.12</string>
 	<key>CFBundleSignature</key>
 	<string>qBit</string>
 	<key>CFBundleExecutable</key>
-	<string>qbittorrent</string>
+	<string>@EXECUTABLE@</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.qbittorrent</string>
 	<key>NSPrincipalClass</key>
@@ -59,7 +59,7 @@
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2006-2016 The qBittorrent project</string>
+	<string>Copyright © 2006-2017 The qBittorrent project</string>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>

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" "" "")

dist/unix/qBittorrent.appdata.xml

@@ -36,26 +36,31 @@
   </description>
   <screenshots>
     <screenshot type="default">
-   <image width="1200" height="675">
+      <image height="675" width="1200">
     https://alexpl.fedorapeople.org/AppData/qbittorrent/screens/qbittorrent_01.png
    </image>
     </screenshot>
     <screenshot>
-   <image width="1200" height="675">
+      <image height="675" width="1200">
     https://alexpl.fedorapeople.org/AppData/qbittorrent/screens/qbittorrent_02.png
    </image>
     </screenshot>
     <screenshot>
-   <image width="1200" height="675">
+      <image height="675" width="1200">
     https://alexpl.fedorapeople.org/AppData/qbittorrent/screens/qbittorrent_03.png
    </image>
     </screenshot>
     <screenshot>
-   <image width="1200" height="675">
+      <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>
+  <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>

dist/windows/README.txt

@@ -16,17 +16,13 @@ TRANSLATORS:
 PACKAGERS:
 
 You will need NSIS and upx to make the installer. You need a unicode version of NSIS.
-I tested with NSIS 3.0a0. 
+I tested with NSIS 3.0 (final).
 
 1. Open the options.nsi file in an editor and change line that contains
    "!define PROG_VERSION "3.0.3"" to the version of qbittorrent you just built.
 2. Extract the plugins found in the folder "nsis plugins" into your
    NSIS's unicode Plugin directory(usually C:\Program Files\NSIS\Plugins\x86-unicode).
-   Only the *.dll files are needed. Don't use the .dll from UAC.zip, use the one from "UAC Unicode.zip".
+   Only the *.dll files are needed. Use the unicode version of the dlls.
-   NOTE: To build the unicode version of UAC with MSVC2008 you need:
-    a) the sources from UAC.zip
-    b) apply the util.cpp.diff from "UAC Unicode.zip" to util.cpp
-    c) in a msvc command prompt issue: cl.exe /O1s /GS- /GR- /EHs-c- /Zl /LD /DUNICODE RunAs.cpp uac.cpp util.cpp /link kernel32.lib user32.lib shell32.lib advapi32.lib ole32.lib /DLL /MANIFEST:NO /OUT:uac.dll 
 3. The script you need to compile is "qbittorrent.nsi". It includes all other necessary scripts.
 4. The script expects the following file tree:
 
@@ -53,6 +49,7 @@ qbittorrent.exe
 qbittorrent.nsi
 qt.conf
 translations.nsi
+UAC.nsh
 uninstaller.nsi
 
 

dist/windows/UAC.nsh

@@ -228,6 +228,8 @@ pop $_LOGICLIB_TEMP
 !undef _UAC_ParseDefineFlags_orin_this
 !ifdef _UAC_ParseDefineFlags_orin_f1
 	!undef _UAC_ParseDefineFlags_orin_f1
+!endif
+!ifdef _UAC_ParseDefineFlags_orin_f2
 	!undef _UAC_ParseDefineFlags_orin_f2
 !endif
 !macroend

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."
 
 
 ;------------------------------------

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."
 
 
 ;------------------------------------

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."
 
 
 ;------------------------------------

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."
 
 
 ;------------------------------------

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."
 
 
 ;------------------------------------

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."
 
 
 ;------------------------------------

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."
 
 
 ;------------------------------------

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."
 
 
 ;------------------------------------

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."
 
 
 ;------------------------------------

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."
 
 
 ;------------------------------------

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."
 
 
 ;------------------------------------

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."
 
 
 ;------------------------------------

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."
 
 
 ;------------------------------------

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."
 
 
 ;------------------------------------

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."
 
 
 ;------------------------------------

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."
 
 
 ;------------------------------------

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."
 
 
 ;------------------------------------

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."
 
 
 ;------------------------------------

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."
 
 
 ;------------------------------------

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."
 
 
 ;------------------------------------

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."
 
 
 ;------------------------------------

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."
 
 
 ;------------------------------------

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."
 
 
 ;------------------------------------

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."
 
 
 ;------------------------------------

dist/windows/installer-translations/icelandic.nsi

@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_ICELANDIC} "A previous installation wa
 LangString inst_unist ${LANG_ICELANDIC} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_ICELANDIC} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_ICELANDIC} "This installer works only in 64-bit Windows versions."
 
 
 ;------------------------------------

dist/windows/installer-translations/indonesian.nsi

@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_INDONESIAN} "A previous installation w
 LangString inst_unist ${LANG_INDONESIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_INDONESIAN} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_INDONESIAN} "This installer works only in 64-bit Windows versions."
 
 
 ;------------------------------------

dist/windows/installer-translations/irish.nsi

@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_IRISH} "A previous installation was de
 LangString inst_unist ${LANG_IRISH} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_IRISH} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_IRISH} "This installer works only in 64-bit Windows versions."
 
 
 ;------------------------------------

dist/windows/installer-translations/italian.nsi

@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_ITALIAN} "A previous installation was
 LangString inst_unist ${LANG_ITALIAN} "Disinstallazione versione precedente."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_ITALIAN} "Esegui qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_ITALIAN} "This installer works only in 64-bit Windows versions."
 
 
 ;------------------------------------

dist/windows/installer-translations/japanese.nsi

@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_JAPANESE} "A previous installation was
 LangString inst_unist ${LANG_JAPANESE} "以前のバージョンをアンインストールしています。"
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_JAPANESE} "qBittorrent を起動する"
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_JAPANESE} "This installer works only in 64-bit Windows versions."
 
 
 ;------------------------------------

dist/windows/installer-translations/korean.nsi

@@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_KOREAN} "A previous installation was d
 LangString inst_unist ${LANG_KOREAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_KOREAN} "Launch qBittorrent."
+;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_KOREAN} "This installer works only in 64-bit Windows versions."
 
 
 ;------------------------------------

dist/windows/installer-translations/kurdish.nsi

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