You've already forked qBittorrent
							
							
				mirror of
				https://github.com/qbittorrent/qBittorrent
				synced 2025-10-30 23:30:54 +01:00 
			
		
		
		
	Compare commits
	
		
			217 Commits
		
	
	
		
			release-4.
			...
			release-4.
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | ac8105c304 | ||
|   | 6cb16cfbb7 | ||
|   | 2b475c4296 | ||
|   | 3a9e4397fd | ||
|   | 1ce0bb7cee | ||
|   | dd4b09f3a9 | ||
|   | 8c2df049f1 | ||
|   | 8b66c444ee | ||
|   | 0ccbdbccf4 | ||
|   | d08b6c81ba | ||
|   | 5f897709cf | ||
|   | e25948e737 | ||
|   | 144956a209 | ||
|   | 667d4e4211 | ||
|   | d957eef331 | ||
|   | baa32a20e0 | ||
|   | eff465126e | ||
|   | 09089b2d33 | ||
|   | 3aa36ad40c | ||
|   | 24bc5a9875 | ||
|   | 744a2cb5a3 | ||
|   | 33e090cfcb | ||
|   | 063844ed44 | ||
|   | 899f8a3f61 | ||
|   | 0f72f22096 | ||
|   | ffda0ab0ac | ||
|   | 21f18623db | ||
|   | c4265db0fd | ||
|   | bc8d9656f6 | ||
|   | bd284facbd | ||
|   | 7eb77cbcbd | ||
|   | 86e96b819e | ||
|   | 132be7ee9d | ||
|   | 9f8a6e8fb1 | ||
|   | e6447c8f28 | ||
|   | 7dd9e73431 | ||
|   | ea82962c5d | ||
|   | b2a43eeffc | ||
|   | 681347148d | ||
|   | 1f63490755 | ||
|   | 0140ed356f | ||
|   | 2c8f322af5 | ||
|   | 6f31ebd899 | ||
|   | 014df529c5 | ||
|   | 482dad00fd | ||
|   | 7898037006 | ||
|   | 5c819ee384 | ||
|   | a590e7139b | ||
|   | 89a8e07217 | ||
|   | 5c05bdaa27 | ||
|   | 7006afc611 | ||
|   | 9cb3a6d29e | ||
|   | 2b6baa6099 | ||
|   | 8881035b7a | ||
|   | 2be30a50ef | ||
|   | 81a7b0c034 | ||
|   | e7235cc3f8 | ||
|   | 1570b51f6c | ||
|   | 6272c6d95d | ||
|   | 473ae25fd8 | ||
|   | 42d7d9b5f4 | ||
|   | 0f77b00428 | ||
|   | 060804d3b8 | ||
|   | f8b6cb4879 | ||
|   | a6d27223db | ||
|   | bb32b88a62 | ||
|   | 332b173e08 | ||
|   | e921cf677a | ||
|   | 973b5a4809 | ||
|   | 688e11a911 | ||
|   | f7e6b96493 | ||
|   | 88bf6f11c7 | ||
|   | 90e2236990 | ||
|   | 6ad7cadc4b | ||
|   | 0499111156 | ||
|   | ae44e59c9a | ||
|   | 1de52f9bcf | ||
|   | 448e55031e | ||
|   | 3b748178c2 | ||
|   | a4a54ce712 | ||
|   | d19b524d2d | ||
|   | 1e2bf50e66 | ||
|   | e7f3409053 | ||
|   | 9758633eeb | ||
|   | 3def5e40c4 | ||
|   | ca923ed02c | ||
|   | e4c3bad93a | ||
|   | 3b52c5ce97 | ||
|   | 44b94803a4 | ||
|   | 5d4644c4fc | ||
|   | a2ef115c66 | ||
|   | 1356f200b8 | ||
|   | 3c68896b1d | ||
|   | 265da50791 | ||
|   | 4037143f4e | ||
|   | 8cae8ad5c5 | ||
|   | 50bd845682 | ||
|   | ed5aa07526 | ||
|   | 437b51b3a5 | ||
|   | c2ccc9dfa4 | ||
|   | b2c7d8211f | ||
|   | 726455ac3e | ||
|   | ae2bb4efeb | ||
|   | 9971329121 | ||
|   | d0ec1c4a86 | ||
|   | 9c55600d81 | ||
|   | b45fb74e01 | ||
|   | f16c585a77 | ||
|   | 9c664d04ae | ||
|   | 3d0ca83474 | ||
|   | e713ffb064 | ||
|   | cf1e61bcf5 | ||
|   | 42b22d6645 | ||
|   | 2d607f8c1a | ||
|   | 69256905c2 | ||
|   | 305316b1fc | ||
|   | 27e222455b | ||
|   | 2b18318e0c | ||
|   | 49cadce253 | ||
|   | f1b908b95b | ||
|   | 4acfcef8da | ||
|   | 69f2196a22 | ||
|   | b20a3c5b8e | ||
|   | 2c5271b3b2 | ||
|   | 7696895a88 | ||
|   | c1ae5d2572 | ||
|   | 0e635c7fdd | ||
|   | 58345e5bbf | ||
|   | 89382d4ec2 | ||
|   | 372f5af36b | ||
|   | f38736729d | ||
|   | bf67ef21c6 | ||
|   | cfd40adcb5 | ||
|   | 8210f9841e | ||
|   | ae3d17ec01 | ||
|   | 349e958be3 | ||
|   | 42acc75394 | ||
|   | 8b91dcedb0 | ||
|   | a454a0303d | ||
|   | 789c6de2e8 | ||
|   | c2fb51159f | ||
|   | bfb0afe3cf | ||
|   | 26a2d4f24d | ||
|   | f6e88c8c55 | ||
|   | 51033c212a | ||
|   | 16c858cf61 | ||
|   | 0496543fce | ||
|   | 746e8a7be1 | ||
|   | 6d301ccf55 | ||
|   | d441b18da0 | ||
|   | 13023ba70a | ||
|   | ecb7c02d4c | ||
|   | fd1ac43157 | ||
|   | c6d4a1f7d4 | ||
|   | 01110690da | ||
|   | c998c7d38d | ||
|   | 230f98da4a | ||
|   | c86db0004f | ||
|   | e645514c8f | ||
|   | f3c9dbd512 | ||
|   | ef650293e3 | ||
|   | 05e217537c | ||
|   | 13cb3b5ca1 | ||
|   | da0b276d5f | ||
|   | 2d73bc9e7d | ||
|   | fdd54fe568 | ||
|   | e5ce24e55e | ||
|   | d90349709b | ||
|   | adb0fe6582 | ||
|   | 5ed81580c9 | ||
|   | 86d6fb86d7 | ||
|   | ddec247d4f | ||
|   | d431ecbe00 | ||
|   | be929ed88c | ||
|   | 2e1f9bf8be | ||
|   | 7fff393b0e | ||
|   | a669ec49ad | ||
|   | 1880082017 | ||
|   | 0cbd15890a | ||
|   | 7fe7c6c277 | ||
|   | e4c177fec7 | ||
|   | 77f4e6c2cf | ||
|   | 4563b11a2e | ||
|   | cb477f9a29 | ||
|   | 58ac07667e | ||
|   | 74bf3af41c | ||
|   | 9317071122 | ||
|   | dab32f2090 | ||
|   | dc464d4d41 | ||
|   | e7e3f6a9db | ||
|   | 5a1c4e79b3 | ||
|   | c6d9ab6810 | ||
|   | d7afad835e | ||
|   | 8608d7b9da | ||
|   | 72970602af | ||
|   | 86579ca87d | ||
|   | e55582124c | ||
|   | bd8b06c607 | ||
|   | 230fedf069 | ||
|   | 7bea10f507 | ||
|   | 7cde969b90 | ||
|   | a3b8f6880b | ||
|   | ad79fc8d43 | ||
|   | fb4bf94a56 | ||
|   | 1c184944fd | ||
|   | ec420f6617 | ||
|   | d908227619 | ||
|   | ac8167410b | ||
|   | 26ce187b30 | ||
|   | 2c4e04e537 | ||
|   | b418f65c2f | ||
|   | dd3a8d5d56 | ||
|   | 49e54a55df | ||
|   | 8cd0a7ae85 | ||
|   | 442f0df613 | ||
|   | f9ee5bdb59 | ||
|   | b9602cc6ab | 
							
								
								
									
										1
									
								
								.github/FUNDING.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								.github/FUNDING.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | ||||
| custom: "https://www.qbittorrent.org/donate.php" | ||||
							
								
								
									
										38
									
								
								.github/workflows/ci.yaml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										38
									
								
								.github/workflows/ci.yaml
									
									
									
									
										vendored
									
									
								
							| @@ -4,20 +4,13 @@ name: GitHub Actions CI | ||||
| # Cache is not used for Ubuntu builds, because it already has all dependencies except | ||||
| # the appropriate libtorrent version, which only takes 3-5 minutes to build from source anyway | ||||
|  | ||||
| on: | ||||
|   push: | ||||
|     branches: [ master ] | ||||
|   pull_request: | ||||
|     types: [edited, opened, reopened, synchronize] | ||||
|     branches: [ master ] | ||||
| on: [pull_request, push] | ||||
|  | ||||
| env: | ||||
|   # Qt: 5.15.1 | ||||
|   # libtorrent: RC_1_2 HEAD, 1.2.11 | ||||
|   VCPKG_COMMIT: 133051b793486ef14e67e9d1f48c9cfe64dc127e | ||||
|   VCPKG_COMMIT: e4ce66eecfd3e5cca5eac06c971921bf8e37cf88 | ||||
|   VCPKG_DEST_MACOS: /Users/runner/qbt_tools/vcpkg | ||||
|   VCPKG_DEST_WIN: C:\qbt_tools\vcpkg | ||||
|   LIBTORRENT_VERSION_TAG: v1.2.11 | ||||
|   LIBTORRENT_VERSION_TAG: v1.2.12 | ||||
|  | ||||
| jobs: | ||||
|  | ||||
| @@ -26,7 +19,7 @@ jobs: | ||||
|  | ||||
|     strategy: | ||||
|       matrix: | ||||
|         os: [ubuntu-20.04, ubuntu-18.04] | ||||
|         os: [ubuntu-20.04] | ||||
|         qbt_gui: ["GUI=ON", "GUI=OFF"] | ||||
|       fail-fast: false | ||||
|  | ||||
| @@ -72,7 +65,7 @@ jobs: | ||||
|     - name: upload artifact as zip | ||||
|       uses: actions/upload-artifact@v2 | ||||
|       with: | ||||
|         name: qBittorrent-CI-Ubuntu_${{ matrix.os }}-${{ matrix.qbt_gui }} | ||||
|         name: qBittorrent-CI_${{ matrix.os }}-x64_${{ matrix.qbt_gui }} | ||||
|         path: | | ||||
|           build/compile_commands.json | ||||
|           build/target_graph.dot | ||||
| @@ -125,10 +118,15 @@ jobs: | ||||
|           "qt5-svg:x64-windows-static-release", | ||||
|           "qt5-tools:x64-windows-static-release", | ||||
|           "qt5-winextras:x64-windows-static-release" | ||||
|         ${{ env.RUNVCPKG_VCPKG_ROOT }}/vcpkg.exe upgrade ` | ||||
|             --overlay-triplets=${{ github.workspace }}/triplets_overlay ` | ||||
|             --overlay-ports=${{ github.workspace }}/vcpkg ` | ||||
|             --no-dry-run | ||||
|         foreach($package in $packages) | ||||
|         { | ||||
|           ${{ env.RUNVCPKG_VCPKG_ROOT }}/vcpkg.exe install $package ` | ||||
|             --overlay-triplets=${{ github.workspace }}/triplets_overlay ` | ||||
|             --overlay-ports=${{ github.workspace }}/vcpkg ` | ||||
|             --clean-after-build | ||||
|         } | ||||
|  | ||||
| @@ -151,7 +149,7 @@ jobs: | ||||
|     - name: upload artifact as zip | ||||
|       uses: actions/upload-artifact@v2 | ||||
|       with: | ||||
|         name: qBittorrent-CI-Windows_x64-static-release | ||||
|         name: qBittorrent-CI_Windows-x64 | ||||
|         path: | | ||||
|           build/compile_commands.json | ||||
|           build/target_graph.dot | ||||
| @@ -199,13 +197,6 @@ jobs: | ||||
|         Add-Content ${{ github.workspace }}/triplets_overlay/x64-osx-release.cmake ` | ||||
|           -Value "set(VCPKG_BUILD_TYPE release)","set(VCPKG_OSX_DEPLOYMENT_TARGET 10.15)" | ||||
|  | ||||
|     # NOTE: Avoids a libtorrent ABI issue. See https://github.com/arvidn/libtorrent/issues/4965 | ||||
|     - name: force AppleClang to compile libtorrent with C++14 | ||||
|       run: | | ||||
|         (Get-Content -path ${{ env.RUNVCPKG_VCPKG_ROOT }}/ports/libtorrent/portfile.cmake).Replace( ` | ||||
|           '${FEATURE_OPTIONS}', '${FEATURE_OPTIONS} -DCMAKE_CXX_STANDARD=14') ` | ||||
|           | Set-Content -Path ${{ env.RUNVCPKG_VCPKG_ROOT }}/ports/libtorrent/portfile.cmake | ||||
|  | ||||
|     - name: install dependencies via vcpkg | ||||
|       run: | | ||||
|         $packages = ` | ||||
| @@ -215,10 +206,15 @@ jobs: | ||||
|           "qt5-svg:x64-osx-release", | ||||
|           "qt5-tools:x64-osx-release", | ||||
|           "qt5-macextras:x64-osx-release" | ||||
|         ${{ env.RUNVCPKG_VCPKG_ROOT }}/vcpkg upgrade ` | ||||
|             --overlay-triplets=${{ github.workspace }}/triplets_overlay ` | ||||
|             --overlay-ports=${{ github.workspace }}/vcpkg ` | ||||
|             --no-dry-run | ||||
|         foreach($package in $packages) | ||||
|         { | ||||
|           ${{ env.RUNVCPKG_VCPKG_ROOT }}/vcpkg install $package ` | ||||
|             --overlay-triplets=${{ github.workspace }}/triplets_overlay ` | ||||
|             --overlay-ports=${{ github.workspace }}/vcpkg ` | ||||
|             --clean-after-build | ||||
|         } | ||||
|  | ||||
| @@ -236,7 +232,7 @@ jobs: | ||||
|     - name: upload artifact as zip | ||||
|       uses: actions/upload-artifact@v2 | ||||
|       with: | ||||
|         name: qBittorrent-CI-macOS_x64-static-release_${{ matrix.qbt_gui }} | ||||
|         name: qBittorrent-CI_macOS_${{ matrix.qbt_gui }} | ||||
|         path: | | ||||
|           build/compile_commands.json | ||||
|           build/target_graph.dot | ||||
|   | ||||
							
								
								
									
										2
									
								
								.github/workflows/file_health.sh
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/file_health.sh
									
									
									
									
										vendored
									
									
								
							| @@ -12,6 +12,7 @@ regressions=0 | ||||
| exclusions_nonutf8='(.*(7z|gif|ic(ns|o)|png|qm|zip))' | ||||
| exclusions_bom='src/base/unicodestrings.h' | ||||
| exclusions_tw='(*.ts)|src/webui/www/private/scripts/lib/mootools-1.2-more.js' | ||||
| exclusions_trailing_newline='configure' | ||||
| exclusions_no_lf='(*.ts)|(.*svg)|compile_commands.json|src/webui/www/private/scripts/lib/mootools-1.2-(core-yc.js|more.js)' | ||||
|  | ||||
| echo -e "\n*** Detect files not encoded in UTF-8 ***\n" | ||||
| @@ -50,6 +51,7 @@ echo -e "\n*** Detect too many trailing newlines ***\n" | ||||
|  | ||||
| find . -path ./build -prune -false -o -path ./.git -prune -false -o -type f -exec file --mime {} \; | sort \ | ||||
|     | grep -e "charset=us-ascii" -e "charset=utf-8" | cut -d ":" -f 1 \ | ||||
|     | grep -E -v -e "${exclusions_trailing_newline}" \ | ||||
|     | xargs -L1 -I my_input bash -c 'test "$(tail -q -c2 "my_input" | hexdump -C | grep "0a 0a")" && echo "my_input"' \ | ||||
|     | tee >(echo -e "--> Too many trailing newlines: found" "$(wc -l < /dev/stdin)" "regression(s)\n") \ | ||||
|     | xargs -I my_input -0 bash -c 'echo "my_input"; test "$(echo -n "my_input" | wc -l)" -eq 0' | ||||
|   | ||||
							
								
								
									
										7
									
								
								.github/workflows/file_health.yaml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								.github/workflows/file_health.yaml
									
									
									
									
										vendored
									
									
								
							| @@ -1,11 +1,6 @@ | ||||
| name: GitHub Actions file health check | ||||
|  | ||||
| on: | ||||
|   push: | ||||
|     branches: [ '**' ] | ||||
|   pull_request: | ||||
|     types: [edited, opened, reopened, synchronize] | ||||
|     branches: [ '**' ] | ||||
| on: [pull_request, push] | ||||
|  | ||||
| jobs: | ||||
|   check_file_health: | ||||
|   | ||||
							
								
								
									
										31
									
								
								.github/workflows/webui_ci.yaml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										31
									
								
								.github/workflows/webui_ci.yaml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,31 @@ | ||||
| name: WebUI CI | ||||
|  | ||||
| on: [pull_request, push] | ||||
|  | ||||
| jobs: | ||||
|   check_webui: | ||||
|     name: Check WebUI | ||||
|     runs-on: ubuntu-20.04 | ||||
|     defaults: | ||||
|       run: | ||||
|         working-directory: src/webui/www | ||||
|  | ||||
|     steps: | ||||
|     - name: checkout repository | ||||
|       uses: actions/checkout@v2 | ||||
|  | ||||
|     - name: setup nodejs | ||||
|       uses: actions/setup-node@v2 | ||||
|       with: | ||||
|         node-version: '14' | ||||
|  | ||||
|     - name: install tools | ||||
|       run: npm install | ||||
|  | ||||
|     - name: lint code | ||||
|       run: npm run lint | ||||
|  | ||||
|     - name: format code | ||||
|       run: | | ||||
|         npm run format | ||||
|         git diff --exit-code | ||||
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -4,6 +4,7 @@ src/qbittorrent | ||||
| src/qbittorrent-nox | ||||
| src/release | ||||
| src/debug | ||||
| src/base/version.h | ||||
| CMakeLists.txt.user* | ||||
| qbittorrent.pro.user* | ||||
| conf.pri | ||||
|   | ||||
							
								
								
									
										14
									
								
								.travis.yml
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								.travis.yml
									
									
									
									
									
								
							| @@ -106,8 +106,8 @@ install: | ||||
|  | ||||
|       brew update > /dev/null | ||||
|       brew upgrade cmake | ||||
|       brew install ccache colormake boost openssl qt zlib | ||||
|       brew link --force qt zlib | ||||
|       brew install ccache colormake boost openssl qt@5 zlib | ||||
|       brew link --force qt@5 zlib | ||||
|  | ||||
|       if [ "$build_system" = "cmake" ]; then | ||||
|         sudo ln -s /usr/local/opt/qt/mkspecs /usr/local/mkspecs | ||||
| @@ -125,11 +125,11 @@ install: | ||||
|       pushd "$HOME" | ||||
|       git clone --single-branch --branch RC_1_2 https://github.com/arvidn/libtorrent.git | ||||
|       cd libtorrent | ||||
|       git checkout tags/v1.2.11 | ||||
|       git checkout tags/v1.2.12 | ||||
|  | ||||
|       cmake \ | ||||
|         -DCMAKE_BUILD_TYPE=Release \ | ||||
|         -DCMAKE_CXX_STANDARD=14 \ | ||||
|         -DCMAKE_CXX_STANDARD=17 \ | ||||
|         -Ddeprecated-functions=OFF \ | ||||
|         -DOPENSSL_ROOT_DIR="$openssl_root_path" \ | ||||
|         ./ | ||||
| @@ -140,13 +140,13 @@ install: | ||||
|       pushd "$HOME" | ||||
|       git clone --single-branch --branch RC_2_0 https://github.com/arvidn/libtorrent.git | ||||
|       cd libtorrent | ||||
|       git checkout tags/v2.0.1 | ||||
|       git checkout tags/v2.0.2 | ||||
|       git submodule update --init --recursive | ||||
|  | ||||
|       cmake \ | ||||
|         -DCMAKE_BUILD_TYPE=Release \ | ||||
|         -DCMAKE_CXX_STANDARD=14 \ | ||||
|         -Ddeprecated-functions=ON \ | ||||
|         -DCMAKE_CXX_STANDARD=17 \ | ||||
|         -Ddeprecated-functions=OFF \ | ||||
|         -DOPENSSL_ROOT_DIR="$openssl_root_path" \ | ||||
|         ./ | ||||
|       make | ||||
|   | ||||
							
								
								
									
										18
									
								
								AUTHORS
									
									
									
									
									
								
							
							
						
						
									
										18
									
								
								AUTHORS
									
									
									
									
									
								
							| @@ -17,19 +17,23 @@ Contributors: | ||||
| * Nick Tiskov <daymansmail@gmail.com> | ||||
|  | ||||
| Code from other projects: | ||||
| * files src/qtsingleapplication/* src/lineedit/* | ||||
| * files src/app/qtlocalpeer/* | ||||
|   copyright: Nokia Corporation | ||||
|   license: LGPL | ||||
|   license: mixed | ||||
|  | ||||
| * files src/ico.cpp src/ico.h | ||||
|   copyright: Malte Starostik <malte@kde.org> | ||||
|   license: LGPL | ||||
| * files src/gui/lineedit.* | ||||
|   copyright: Trolltech ASA <info@trolltech.com> | ||||
|   license: custom | ||||
|  | ||||
| * files src/search_engine/socks.py | ||||
|   copyright: Dan Haim <negativeiq@users.sourceforge.net> | ||||
|   license: BSD | ||||
|  | ||||
| * file src/stacktrace_win.h | ||||
| * file src/app/stacktrace.h | ||||
|   copyright: Timo Bingmann from http://idlebox.net/ | ||||
|   license: WTFPL v2.0 | ||||
|  | ||||
| * file src/app/stacktrace_win.h | ||||
|   copyright: Quassel Project | ||||
|   license: GPLv2/3 | ||||
|  | ||||
| @@ -119,7 +123,7 @@ Translations authors: | ||||
|   - German: Niels Hoffmann (zentralmaschine@users.sourceforge.net) | ||||
|   - Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net), Stephanos Antaris (santaris@csd.auth.gr), sledgehammer999(hammered999@gmail.com) and Γιάννης Ανθυμίδης Evropi(Transifex) | ||||
|   - Hebrew: David Deutsch (d.deffo@gmail.com) | ||||
|   - Hungarian: Majoros Péter (majoros.j.p@t-online.hu) | ||||
|   - Hungarian: Majoros Péter | ||||
|   - Italian: bovirus (bovirus@live.it) and Matteo Sechi (bu17714@gmail.com) | ||||
|   - Japanese: Masato Hashimoto (cabezon.hashimoto@gmail.com) | ||||
|   - Korean: Jin Woo Sin (jin828sin@users.sourceforge.net) | ||||
|   | ||||
| @@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) # Policies <= CMP0097 default t | ||||
| list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules) | ||||
|  | ||||
| project(qBittorrent | ||||
|     VERSION 4.3.2.0 | ||||
|     DESCRIPTION "The qBittorrent BitTorrent client" | ||||
|     HOMEPAGE_URL "https://www.qbittorrent.org/" | ||||
|     LANGUAGES CXX | ||||
| @@ -13,9 +12,9 @@ project(qBittorrent | ||||
| set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ON) | ||||
| # version requirements - older vesions may work, but you are on your own | ||||
| set(minBoostVersion 1.65) | ||||
| set(minQtVersion 5.9.5) | ||||
| set(minQtVersion 5.11) | ||||
| set(minOpenSSLVersion 1.1.1) | ||||
| set(minLibtorrentVersion 1.2.11) | ||||
| set(minLibtorrentVersion 1.2.12) | ||||
| set(minZlibVersion 1.2.11) | ||||
|  | ||||
| # features (some are platform-specific) | ||||
| @@ -51,8 +50,6 @@ elseif (MSVC) | ||||
|     feature_option(MSVC_RUNTIME_DYNAMIC "Use MSVC dynamic runtime library (-MD) instead of static (-MT)" ON) | ||||
| endif() | ||||
|  | ||||
| set(QBT_VER_STATUS "alpha1" CACHE STRING "Project status version. Should be empty for release builds.") | ||||
|  | ||||
| include(GNUInstallDirs) | ||||
| add_subdirectory(src) | ||||
| add_subdirectory(dist) | ||||
| @@ -62,3 +59,6 @@ if (VERBOSE_CONFIGURE) | ||||
| else() | ||||
|     feature_summary(WHAT ENABLED_FEATURES DISABLED_FEATURES) | ||||
| endif() | ||||
|  | ||||
| # Generate version header | ||||
| configure_file("src/base/version.h.in" "${CMAKE_CURRENT_SOURCE_DIR}/src/base/version.h" @ONLY) | ||||
|   | ||||
							
								
								
									
										7
									
								
								COPYING
									
									
									
									
									
								
							
							
						
						
									
										7
									
								
								COPYING
									
									
									
									
									
								
							| @@ -1,5 +1,6 @@ | ||||
| qBittorrent is licensed under the GNU General Public License version 2 with the | ||||
| addition of the following special exception: | ||||
| qBittorrent is licensed under the GNU General Public License either version 2, | ||||
| or (at your option) any later version with the addition of the following | ||||
| special exception: | ||||
|  | ||||
| In addition, as a special exception, the copyright holders give permission to | ||||
| link this program with the OpenSSL project's "OpenSSL" library (or with | ||||
| @@ -10,6 +11,8 @@ modify file(s), you may extend this exception to your version of the file(s), | ||||
| but you are not obligated to do so. If you do not wish to do so, delete this | ||||
| exception statement from your version. | ||||
|  | ||||
| See also the AUTHORS file | ||||
|  | ||||
| ---------- | ||||
|  | ||||
|                     GNU GENERAL PUBLIC LICENSE | ||||
|   | ||||
							
								
								
									
										95
									
								
								Changelog
									
									
									
									
									
								
							
							
						
						
									
										95
									
								
								Changelog
									
									
									
									
									
								
							| @@ -1,3 +1,98 @@ | ||||
| Sat Jun 26 2021 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.6 | ||||
|     - FEATURE: New languages: Mongolian, Persian, Thai | ||||
|     - BUGFIX: Provide correct error description in "upload mode" (glassez) | ||||
|     - BUGFIX: Allow adding torrents with relative save path (glassez) | ||||
|     - BUGFIX: Fix main window turns blank after restoring from tray (#15031) (Chocobo1) | ||||
|     - BUGFIX: Remove the lockfile on exit (#14997) (brvphoenix) | ||||
|     - BUGFIX: Improve "Watched folders" feature (glassez) | ||||
|     - BUGFIX: Keep sub-sorting order (#15074) (Dmitry Khlestkov) | ||||
|     - BUGFIX: Properly add torrent with new tags (glassez) | ||||
|     - WINDOWS: NSIS: Update Japanese, Turkish, Hungarian, Swedish translation (maboroshin, Burak Yavuz, xkrstudio, nonew-star) | ||||
|  | ||||
| Sun May 02 2021 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.5 | ||||
|     - BUGFIX: Move cursor to the end when autofilling URL/hash in "Download from URLs" dialog (Chocobo1) | ||||
|     - BUGFIX: Sort invalid QDateTime values after valid values (Chocobo1) | ||||
|     - BUGFIX: Fix tabChangesFocus attribute in "Edit trackers" dialog (Christoph Rackwitz) | ||||
|     - BUGFIX: Update DynDNS register url (zhuangzi926) | ||||
|     - BUGFIX: Handle "not enough disk space" error more graciously (glassez) | ||||
|     - BUGFIX: Correctly draw progress background with stylesheet (jagannatharjun) | ||||
|     - WEBUI: Fix magnet url from the search facility (Chocobo1) | ||||
|     - WEBUI: Revise folder monitoring functions (Chocobo1) | ||||
|     - WEBUI: Fix magnet url from the browser (brvphoenix) | ||||
|     - WEBUI: Allow to specify file indexes in torrents/files API (glassez) | ||||
|     - WINDOWS: NSIS: Allow more strings to translated (bovirus, Chocobo1) | ||||
|     - WINDOWS: NSIS: Update Italian, German, Estonian, Russian, PortugueseBR translations (bovirus, Henry Water, PriitUring, Долматов Алексей, Felipe) | ||||
|     - LINUX: Fix D-Bus Notification `desktop-entry` field (Chocobo1) | ||||
|     - MACOS: Don't use executable name as CFBundleName value (Nick Korotysh) | ||||
|     - OTHER: Lower Qt requirement to 5.11 (sledgehammer999) | ||||
|     - OTHER: Clarify that the license is GPLv2+ (sledgehammer999) | ||||
|  | ||||
| Wed Mar 24 2021 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.4.1 | ||||
|     - BUGFIX: Correctly draw progress bar (glassez) | ||||
|     - WEBUI: Fix javascript code which broke the UI (Chocobo1) | ||||
|  | ||||
| Tue Mar 23 2021 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.4 | ||||
|     - FEATURE: Add ability to prioritize selected items by shown file order (Chocobo1) | ||||
|     - FEATURE: Allow tab to escape the text box in "Edit trackers" dialog (Christoph Rackwitz) | ||||
|     - FEATURE: Support sub-sorting in Transferlist (jagannatharjun) | ||||
|     - FEATURE: Expose ToS setting from libtorrent (Chocobo1) | ||||
|     - FEATURE: Improve tracker entries handling (glassez) | ||||
|     - BUGFIX: Drop extension from generated content folder name (glassez) | ||||
|     - BUGFIX: Change qBittorrent Updater window title (xavier2k6) | ||||
|     - BUGFIX: Validate HTTPS Tracker Certificate by default (an0n666) | ||||
|     - BUGFIX: Don't let "program update" dialog steal focus (Chocobo1) | ||||
|     - BUGFIX: Disable expand on double click in TorrentContentTreeView (jagannatharjun) | ||||
|     - BUGFIX: Add hyperlink to Transifex on translator list (Si Yong Kim) | ||||
|     - BUGFIX: Enlarge "speed limit" icon slightly (Chocobo1) | ||||
|     - BUGFIX: Don't prevent system sleep due to errored torrents (dyumin) | ||||
|     - BUGFIX: Use stable sorting in transfer list (Chocobo1) | ||||
|     - BUGFIX: Allow "missing files" torrents to save more resume data (glassez) | ||||
|     - BUGFIX: Restart "missing files" torrents after changing location (glassez) | ||||
|     - BUGFIX: Show proper string when torrent availability is not available (Chocobo1) | ||||
|     - BUGFIX: Apply "Hide zero/infinity values" to "Time Active", "Down/Up Limit" and ETA columns (Chocobo1) | ||||
|     - BUGFIX: Fix potential out-of-bounds access (Chocobo1) | ||||
|     - BUGFIX: Make SpeedPlotView averager time aware (jagannatharjun) | ||||
|     - BUGFIX: Add a 3-Hour graph (jagannatharjun) | ||||
|     - BUGFIX: Add an option to disable icons in menus (always disabled on MacOS) (Michał Kopeć) | ||||
|     - BUGFIX: Improve detection of filename extension of audio/video files (Chocobo1) | ||||
|     - BUGFIX: Various drawing improvements of progress bar (Chocobo1) | ||||
|     - BUGFIX: Properly stop torrent creation if aborted (Chocobo1) | ||||
|     - BUGFIX: Replace external program parameters in one step (Chocobo1) | ||||
|     - BUGFIX: Improve "save resume data" handling (glassez) | ||||
|     - BUGFIX: Fix bad IPv6 address format for outgoingInterfaces (treysis) | ||||
|     - WEBUI: Properly decode strings (brvphoenix) | ||||
|     - WEBUI: Accept "share limits" when adding torrent using WebAPI (glassez) | ||||
|     - WEBUI: Add seeding time to the active time column (thalieht) | ||||
|     - WEBUI: Fix incorrect seeding time string in General tab (thalieht) | ||||
|     - WEBUI: Allow >100 days in WebUI function "friendlyDuration" (thalieht) | ||||
|     - WEBUI: Avoid decoding strings repeatedly (brvphoenix) | ||||
|     - RSS: Add category button on AutomatedRSSDownloader on GUI (Si Yong Kim) | ||||
|     - WINDOWS: NSIS: Update Czech translation (slrslr) | ||||
|     - WINDOWS: NSIS: Update Portuguese BR translation (Alex) | ||||
|     - WINDOWS: NSIS: Add Estonian translation (PriitUring) | ||||
|     - WINDOWS: Allow change-case-only file renaming (glassez) | ||||
|     - LINUX: Systemd: wait for mounting of local filesystems (Juraj Oršulić) | ||||
|     - OTHER: Raise minimum libtorrent version to 1.2.12 (glassez) | ||||
|     - OTHER: Raise minimum Qt version to 5.12 (glassez) | ||||
|  | ||||
| Tue Jan 19 2021 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.3 | ||||
|     - FEATURE: New languages: Azerbaijani, Estonian | ||||
|     - BUGFIX: Unify global speed dialogs for normal/alternative speeds (thalieht) | ||||
|     - BUGFIX: Increase maximum global speed limits ~2 GiB/s (thalieht) | ||||
|     - BUGFIX: Save fastresume when setting torrent speed limits (thalieht) | ||||
|     - BUGFIX: Group several torrent options into one dialog (thalieht) | ||||
|     - BUGFIX: Capitalize locale names (Chocobo1) | ||||
|     - BUGFIX: Improve content file/folder names handling (glassez) | ||||
|     - BUGFIX: Drop notification about move storage finished or failed (glassez) | ||||
|     - BUGFIX: Reload "missing files" torrent instead of re-checking (glassez) | ||||
|     - BUGFIX: Remember dialog sizes (Chocobo1) | ||||
|     - BUGFIX: Improve detection of file extension string (Chocobo1) | ||||
|     - WEBUI: Don't call non-existent elements (glassez) | ||||
|     - WEBUI: Update "Keep top-level folder" in WebUI options (thalieht) | ||||
|     - MACOS: QMake: Raise minimal macOS target version to 10.14 (glassez) | ||||
|     - LINUX: Use legacy 'data' directory only as a fallback (lbilli) | ||||
|     - OTHER: Bump project requirement to C++17 (Chocobo1) | ||||
|  | ||||
| Sun Dec 27 2020 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.2 | ||||
|     - FEATURE: Allow to add root folder to torrent content (glassez) | ||||
|     - FEATURE: "HTTPS tracker validation" option is available on all platforms with latest libtorrent (Chocobo1) | ||||
|   | ||||
							
								
								
									
										4
									
								
								INSTALL
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								INSTALL
									
									
									
									
									
								
							| @@ -5,13 +5,13 @@ qBittorrent - A BitTorrent client in C++ / Qt | ||||
|  | ||||
|   - Boost >= 1.65 | ||||
|  | ||||
|   - libtorrent-rasterbar >= 1.2.11 (by Arvid Norberg) | ||||
|   - libtorrent-rasterbar >= 1.2.12 (by Arvid Norberg) | ||||
|       * https://www.libtorrent.org/ | ||||
|       * Be careful: another library (the one used by rTorrent) uses a similar name | ||||
|  | ||||
|   - OpenSSL >= 1.1.1 | ||||
|  | ||||
|   - Qt >= 5.9.5 | ||||
|   - Qt >= 5.12 | ||||
|  | ||||
|   - zlib >= 1.2.11 | ||||
|  | ||||
|   | ||||
							
								
								
									
										19
									
								
								build_dist.sh
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										19
									
								
								build_dist.sh
									
									
									
									
									
										Executable file
									
								
							| @@ -0,0 +1,19 @@ | ||||
| #!/bin/sh | ||||
|  | ||||
| # get version numbers | ||||
| versionSrc="src/base/version.h.in" | ||||
| versionMajor="$(grep -Po '(?<=QBT_VERSION_MAJOR )\d+' "$versionSrc")" | ||||
| versionMinor="$(grep -Po '(?<=QBT_VERSION_MINOR )\d+' "$versionSrc")" | ||||
| versionBugfix="$(grep -Po '(?<=QBT_VERSION_BUGFIX )\d+' "$versionSrc")" | ||||
| versionBuild="$(grep -Po '(?<=QBT_VERSION_BUILD )\d+' "$versionSrc")" | ||||
| versionStatus="$(grep -Po '(?<=QBT_VERSION_STATUS ")\w+' "$versionSrc")" | ||||
|  | ||||
| if [ "$versionBuild" != "0" ]; then | ||||
|     projectVersion="$versionMajor.$versionMinor.$versionBugfix.$versionBuild$versionStatus" | ||||
| else | ||||
|     projectVersion="$versionMajor.$versionMinor.$versionBugfix$versionStatus" | ||||
| fi | ||||
|  | ||||
| # pack archives | ||||
| git archive --format=tar --prefix="qbittorrent-$projectVersion/" HEAD | gzip -9 > "qbittorrent-$projectVersion.tar.gz" | ||||
| git archive --format=tar --prefix="qbittorrent-$projectVersion/" HEAD | xz -9 > "qbittorrent-$projectVersion.tar.xz" | ||||
| @@ -7,47 +7,16 @@ macro(qbt_common_config) | ||||
|     # treat value specified by the CXX_STANDARD target property as a requirement by default | ||||
|     set(CMAKE_CXX_STANDARD_REQUIRED ON) | ||||
|  | ||||
|     # these definitions are only needed for calls to | ||||
|     # lt::generate_fingerprint and for the qbittorrent.rc file on Windows | ||||
|     add_library(qbt_version_definitions INTERFACE) | ||||
|  | ||||
|     target_compile_definitions(qbt_version_definitions INTERFACE | ||||
|         QBT_VERSION_MAJOR=${qBittorrent_VERSION_MAJOR} | ||||
|         QBT_VERSION_MINOR=${qBittorrent_VERSION_MINOR} | ||||
|         QBT_VERSION_BUGFIX=${qBittorrent_VERSION_PATCH} | ||||
|         QBT_VERSION_BUILD=${qBittorrent_VERSION_TWEAK} | ||||
|     ) | ||||
|  | ||||
|     add_library(qbt_common_cfg INTERFACE) | ||||
|  | ||||
|     # Full C++ 14 support is required | ||||
|     # Full C++ 17 support is required | ||||
|     # See also https://cmake.org/cmake/help/latest/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.html | ||||
|     # for a breakdown of the features that CMake recognizes for each C++ standard | ||||
|     target_compile_features(qbt_common_cfg INTERFACE | ||||
|         cxx_std_14 | ||||
|         cxx_aggregate_default_initializers | ||||
|         cxx_attribute_deprecated | ||||
|         cxx_binary_literals | ||||
|         cxx_contextual_conversions | ||||
|         cxx_decltype_auto | ||||
|         cxx_digit_separators | ||||
|         cxx_generic_lambdas | ||||
|         cxx_lambda_init_captures | ||||
|         cxx_relaxed_constexpr | ||||
|         cxx_return_type_deduction | ||||
|         cxx_variable_templates | ||||
|         cxx_std_17 | ||||
|     ) | ||||
|  | ||||
|     set(QBT_PROJECT_VERSION "${qBittorrent_VERSION_MAJOR}.${qBittorrent_VERSION_MINOR}.${qBittorrent_VERSION_PATCH}") | ||||
|     if (NOT ${qBittorrent_VERSION_TWEAK} EQUAL 0) | ||||
|         set(QBT_PROJECT_VERSION "${QBT_PROJECT_VERSION}.${qBittorrent_VERSION_TWEAK}") | ||||
|     endif() | ||||
|  | ||||
|     set(QBT_FULL_VERSION "${QBT_PROJECT_VERSION}${QBT_VER_STATUS}") | ||||
|  | ||||
|     target_compile_definitions(qbt_common_cfg INTERFACE | ||||
|         QBT_VERSION="v${QBT_FULL_VERSION}" | ||||
|         QBT_VERSION_2="${QBT_FULL_VERSION}" | ||||
|         QT_DEPRECATED_WARNINGS | ||||
|         QT_NO_CAST_TO_ASCII | ||||
|         QT_NO_CAST_FROM_BYTEARRAY | ||||
| @@ -90,6 +59,12 @@ macro(qbt_common_config) | ||||
|         endif() | ||||
|     endif() | ||||
|  | ||||
|     if ((CXX_COMPILER_ID STREQUAL "Clang") OR (CXX_COMPILER_ID STREQUAL "AppleClang")) | ||||
|         target_compile_options(qbt_common_cfg INTERFACE | ||||
|             -Wno-range-loop-analysis | ||||
|         ) | ||||
|     endif() | ||||
|  | ||||
|     if (MINGW) | ||||
|         target_link_options(qbt_common_cfg INTERFACE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:LINKER:--dynamicbase>) | ||||
|     endif() | ||||
| @@ -101,8 +76,12 @@ macro(qbt_common_config) | ||||
|     endif() | ||||
|  | ||||
|     if (MSVC) | ||||
|         target_compile_options(qbt_common_cfg INTERFACE /guard:cf) | ||||
|         target_link_options(qbt_common_cfg INTERFACE /guard:cf | ||||
|         target_compile_options(qbt_common_cfg INTERFACE | ||||
|             /guard:cf | ||||
|             /utf-8 | ||||
|         ) | ||||
|         target_link_options(qbt_common_cfg INTERFACE | ||||
|             /guard:cf | ||||
|             $<$<NOT:$<CONFIG:Debug>>:/OPT:REF /OPT:ICF> | ||||
|             # suppress linking warning due to /INCREMENTAL and /OPT:ICF being both ON | ||||
|             $<$<CONFIG:RelWithDebInfo>:/INCREMENTAL:NO> | ||||
|   | ||||
							
								
								
									
										48
									
								
								configure.ac
									
									
									
									
									
								
							
							
						
						
									
										48
									
								
								configure.ac
									
									
									
									
									
								
							| @@ -1,4 +1,4 @@ | ||||
| AC_INIT([qbittorrent], [v4.3.2], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/]) | ||||
| AC_INIT([qbittorrent], [v4.3.6], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/]) | ||||
| AC_CONFIG_AUX_DIR([build-aux]) | ||||
| AC_CONFIG_MACRO_DIR([m4]) | ||||
| : ${CFLAGS=""} | ||||
| @@ -141,7 +141,7 @@ AS_IF([test "x$QT_QMAKE" = "x"], | ||||
|       [AC_MSG_ERROR([Could not find qmake]) | ||||
|       ]) | ||||
| AS_IF([test "x$enable_gui" = "xyes"], | ||||
|       [PKG_CHECK_MODULES(Qt5Svg, [Qt5Svg >= 5.5.1]) | ||||
|       [PKG_CHECK_MODULES(Qt5Svg, [Qt5Svg >= 5.11]) | ||||
|       ]) | ||||
| AC_MSG_CHECKING([whether QtDBus should be enabled]) | ||||
| AS_CASE(["x$enable_qt_dbus"], | ||||
| @@ -180,7 +180,7 @@ AC_MSG_NOTICE([Boost.System LIB: "$BOOST_SYSTEM_LIB"]) | ||||
| LIBS="$BOOST_SYSTEM_LIB $LIBS" | ||||
|  | ||||
| PKG_CHECK_MODULES(libtorrent, | ||||
|                   [libtorrent-rasterbar >= 1.2.11], | ||||
|                   [libtorrent-rasterbar >= 1.2.12], | ||||
|                   [CXXFLAGS="$libtorrent_CFLAGS $CXXFLAGS" | ||||
|                   LIBS="$libtorrent_LIBS $LIBS"]) | ||||
|  | ||||
| @@ -194,34 +194,34 @@ PKG_CHECK_MODULES(zlib, | ||||
|                  [CXXFLAGS="$zlib_CFLAGS $CXXFLAGS" | ||||
|                  LIBS="$zlib_LIBS $LIBS"]) | ||||
|  | ||||
| # Check if already in >= C++14 mode because of the flags returned by one of the above packages | ||||
| # Check if already in >= C++17 mode because of the flags returned by one of the above packages | ||||
| TMP_CXXFLAGS="$CXXFLAGS" | ||||
| CXXFLAGS="" | ||||
| AC_MSG_CHECKING([if compiler defaults to C++14 or later mode]) | ||||
| AC_COMPILE_IFELSE([DETECT_CPP14_PROGRAM()], | ||||
| AC_MSG_CHECKING([if compiler defaults to C++17 or later mode]) | ||||
| AC_COMPILE_IFELSE([DETECT_CPP17_PROGRAM()], | ||||
|                   [AC_MSG_RESULT([yes]) | ||||
|                    QBT_CXX14_FOUND="yes"], | ||||
|                    QBT_CXX17_FOUND="yes"], | ||||
|                   [AC_MSG_RESULT([no]) | ||||
|                    QBT_CXX14_FOUND="no"]) | ||||
|                    QBT_CXX17_FOUND="no"]) | ||||
|  | ||||
| # In case of no, check if the compiler can support at least C++14 | ||||
| # In case of no, check if the compiler can support at least C++17 | ||||
| # and if yes, enable it leaving a warning to the user | ||||
| AS_IF([test "x$QBT_CXX14_FOUND" = "xno"], | ||||
|       [AC_MSG_CHECKING([if compiler supports C++14]) | ||||
|        CXXFLAGS="-std=c++14" | ||||
|        AC_COMPILE_IFELSE([DETECT_CPP14_PROGRAM()], | ||||
| AS_IF([test "x$QBT_CXX17_FOUND" = "xno"], | ||||
|       [AC_MSG_CHECKING([if compiler supports C++17]) | ||||
|        CXXFLAGS="-std=c++17" | ||||
|        AC_COMPILE_IFELSE([DETECT_CPP17_PROGRAM()], | ||||
|                         [AC_MSG_RESULT([yes]) | ||||
|                          AC_MSG_CHECKING([if C++14 is disabled by the set compiler flags]) | ||||
|                          AC_MSG_CHECKING([if C++17 is disabled by the set compiler flags]) | ||||
|                          # prepend the flag so it won't override conflicting user defined flags | ||||
|                          CXXFLAGS="-std=c++14 $TMP_CXXFLAGS" | ||||
|                          AC_COMPILE_IFELSE([DETECT_CPP14_PROGRAM()], | ||||
|                          CXXFLAGS="-std=c++17 $TMP_CXXFLAGS" | ||||
|                          AC_COMPILE_IFELSE([DETECT_CPP17_PROGRAM()], | ||||
|                                            [AC_MSG_RESULT([no]) | ||||
|                                             QBT_ADD_CONFIG="$QBT_ADD_CONFIG c++14" | ||||
|                                             AC_MSG_WARN([C++14 mode is now force enabled. The C++ mode should match the mode that other libraries were built with, otherwise you'll likely get linking errors.])], | ||||
|                                             QBT_ADD_CONFIG="$QBT_ADD_CONFIG c++1z" | ||||
|                                             AC_MSG_WARN([C++17 mode is now force enabled. The C++ mode should match the mode that other libraries were built with, otherwise you'll likely get linking errors.])], | ||||
|                                            [AC_MSG_RESULT([yes]) | ||||
|                                             AC_MSG_ERROR([The compiler supports C++14 but the user or a dependency has explicitly enabled a lower mode.])])], | ||||
|                                             AC_MSG_ERROR([The compiler supports C++17 but the user or a dependency has explicitly enabled a lower mode.])])], | ||||
|                         [AC_MSG_RESULT([no]) | ||||
|                          AC_MSG_ERROR([A compiler supporting C++14 is required.])]) | ||||
|                          AC_MSG_ERROR([A compiler supporting C++17 is required.])]) | ||||
|       ]) | ||||
| CXXFLAGS="$TMP_CXXFLAGS" | ||||
|  | ||||
| @@ -272,9 +272,13 @@ AC_SUBST(QBT_REMOVE_CONFIG) | ||||
| AC_SUBST(QBT_ADD_DEFINES) | ||||
| AC_SUBST(QBT_REMOVE_DEFINES) | ||||
|  | ||||
| AC_OUTPUT(conf.pri) | ||||
| QBT_CONFIG_FILES="conf.pri" | ||||
|  | ||||
| AS_IF([test "x$enable_systemd" = "xyes"], | ||||
|       [AC_OUTPUT(dist/unix/systemd/qbittorrent-nox@.service)]) | ||||
|       [QBT_CONFIG_FILES="$QBT_CONFIG_FILES dist/unix/systemd/qbittorrent-nox@.service"]) | ||||
|  | ||||
| AC_CONFIG_FILES(["$QBT_CONFIG_FILES"]) | ||||
| AC_OUTPUT | ||||
|  | ||||
| AC_MSG_NOTICE([Running qmake to generate the makefile...]) | ||||
| TOPDIR="$(cd "$(dirname "$0")" && pwd)" | ||||
|   | ||||
							
								
								
									
										8
									
								
								dist/mac/Info.plist
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								dist/mac/Info.plist
									
									
									
									
										vendored
									
									
								
							| @@ -47,7 +47,7 @@ | ||||
| 		</dict> | ||||
| 	</array> | ||||
| 	<key>CFBundleName</key> | ||||
| 	<string>@EXECUTABLE@</string> | ||||
| 	<string>qBittorrent</string> | ||||
| 	<key>CFBundleIconFile</key> | ||||
| 	<string>qbittorrent_mac.icns</string> | ||||
| 	<key>CFBundleInfoDictionaryVersion</key> | ||||
| @@ -55,9 +55,9 @@ | ||||
| 	<key>CFBundlePackageType</key> | ||||
| 	<string>APPL</string> | ||||
| 	<key>CFBundleShortVersionString</key> | ||||
| 	<string>4.3.2</string> | ||||
| 	<string>4.3.6</string> | ||||
| 	<key>CFBundleExecutable</key> | ||||
| 	<string>@EXECUTABLE@</string> | ||||
| 	<string>${EXECUTABLE_NAME}</string> | ||||
| 	<key>CFBundleIdentifier</key> | ||||
| 	<string>org.qbittorrent.qBittorrent</string> | ||||
| 	<key>LSMinimumSystemVersion</key> | ||||
| @@ -67,7 +67,7 @@ | ||||
| 	<key>NSAppleScriptEnabled</key> | ||||
| 	<string>YES</string> | ||||
| 	<key>NSHumanReadableCopyright</key> | ||||
| 	<string>Copyright © 2006-2020 The qBittorrent project</string> | ||||
| 	<string>Copyright © 2006-2021 The qBittorrent project</string> | ||||
| 	<key>UTExportedTypeDeclarations</key> | ||||
| 	<array> | ||||
| 		<dict> | ||||
|   | ||||
							
								
								
									
										
											BIN
										
									
								
								dist/qt-translations/qt_fa.qm
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								dist/qt-translations/qt_fa.qm
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								dist/qt-translations/qt_gl.qm
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								dist/qt-translations/qt_gl.qm
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								dist/qt-translations/qt_lt.qm
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								dist/qt-translations/qt_lt.qm
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								dist/qt-translations/qt_pt.qm
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								dist/qt-translations/qt_pt.qm
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								dist/qt-translations/qt_sl.qm
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								dist/qt-translations/qt_sl.qm
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								dist/qt-translations/qt_zh_CN.qm
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								dist/qt-translations/qt_zh_CN.qm
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								dist/qt-translations/qtbase_ar.qm
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								dist/qt-translations/qtbase_ar.qm
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								dist/qt-translations/qtbase_bg.qm
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								dist/qt-translations/qtbase_bg.qm
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								dist/qt-translations/qtbase_ca.qm
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								dist/qt-translations/qtbase_ca.qm
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								dist/qt-translations/qtbase_cs.qm
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								dist/qt-translations/qtbase_cs.qm
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								dist/qt-translations/qtbase_da.qm
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								dist/qt-translations/qtbase_da.qm
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								dist/qt-translations/qtbase_de.qm
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								dist/qt-translations/qtbase_de.qm
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								dist/qt-translations/qtbase_es.qm
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								dist/qt-translations/qtbase_es.qm
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								dist/qt-translations/qtbase_fi.qm
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								dist/qt-translations/qtbase_fi.qm
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								dist/qt-translations/qtbase_fr.qm
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								dist/qt-translations/qtbase_fr.qm
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user