mirror of
				https://github.com/ciphervance/supercell-wx.git
				synced 2025-10-31 03:20:05 +00:00 
			
		
		
		
	Merge pull request #428 from dpaulat/feature/qt-6.8.3
This commit is contained in:
		
						commit
						3d43360e21
					
				
					 7 changed files with 10 additions and 10 deletions
				
			
		
							
								
								
									
										8
									
								
								.github/workflows/ci.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								.github/workflows/ci.yml
									
										
									
									
										vendored
									
									
								
							|  | @ -28,7 +28,7 @@ jobs: | ||||||
|             compiler: msvc |             compiler: msvc | ||||||
|             msvc_arch: x64 |             msvc_arch: x64 | ||||||
|             msvc_version: 2022 |             msvc_version: 2022 | ||||||
|             qt_version: 6.8.1 |             qt_version: 6.8.3 | ||||||
|             qt_arch_aqt: win64_msvc2022_64 |             qt_arch_aqt: win64_msvc2022_64 | ||||||
|             qt_arch_dir: msvc2022_64 |             qt_arch_dir: msvc2022_64 | ||||||
|             qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport |             qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport | ||||||
|  | @ -43,7 +43,7 @@ jobs: | ||||||
|             env_cc: gcc-11 |             env_cc: gcc-11 | ||||||
|             env_cxx: g++-11 |             env_cxx: g++-11 | ||||||
|             compiler: gcc |             compiler: gcc | ||||||
|             qt_version: 6.8.1 |             qt_version: 6.8.3 | ||||||
|             qt_arch_aqt: linux_gcc_64 |             qt_arch_aqt: linux_gcc_64 | ||||||
|             qt_arch_dir: gcc_64 |             qt_arch_dir: gcc_64 | ||||||
|             qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport |             qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport | ||||||
|  | @ -59,7 +59,7 @@ jobs: | ||||||
|             env_cc: clang-17 |             env_cc: clang-17 | ||||||
|             env_cxx: clang++-17 |             env_cxx: clang++-17 | ||||||
|             compiler: clang |             compiler: clang | ||||||
|             qt_version: 6.8.1 |             qt_version: 6.8.3 | ||||||
|             qt_arch_aqt: linux_gcc_64 |             qt_arch_aqt: linux_gcc_64 | ||||||
|             qt_arch_dir: gcc_64 |             qt_arch_dir: gcc_64 | ||||||
|             qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport |             qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport | ||||||
|  | @ -75,7 +75,7 @@ jobs: | ||||||
|             env_cc: gcc-11 |             env_cc: gcc-11 | ||||||
|             env_cxx: g++-11 |             env_cxx: g++-11 | ||||||
|             compiler: gcc |             compiler: gcc | ||||||
|             qt_version: 6.8.1 |             qt_version: 6.8.3 | ||||||
|             qt_arch_aqt: linux_gcc_arm64 |             qt_arch_aqt: linux_gcc_arm64 | ||||||
|             qt_arch_dir: gcc_arm64 |             qt_arch_dir: gcc_arm64 | ||||||
|             qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport |             qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport | ||||||
|  |  | ||||||
							
								
								
									
										2
									
								
								.github/workflows/clang-tidy-review.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/clang-tidy-review.yml
									
										
									
									
										vendored
									
									
								
							|  | @ -20,7 +20,7 @@ jobs: | ||||||
|             build_type: Release |             build_type: Release | ||||||
|             env_cc: clang-18 |             env_cc: clang-18 | ||||||
|             env_cxx: clang++-18 |             env_cxx: clang++-18 | ||||||
|             qt_version: 6.8.1 |             qt_version: 6.8.3 | ||||||
|             qt_arch_aqt: linux_gcc_64 |             qt_arch_aqt: linux_gcc_64 | ||||||
|             qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport |             qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport | ||||||
|             qt_tools: '' |             qt_tools: '' | ||||||
|  |  | ||||||
|  | @ -3,7 +3,7 @@ call tools\setup-common.bat | ||||||
| set build_dir=build-debug | set build_dir=build-debug | ||||||
| set build_type=Debug | set build_type=Debug | ||||||
| set conan_profile=scwx-win64_msvc2022 | set conan_profile=scwx-win64_msvc2022 | ||||||
| set qt_version=6.8.1 | set qt_version=6.8.3 | ||||||
| set qt_arch=msvc2022_64 | set qt_arch=msvc2022_64 | ||||||
| 
 | 
 | ||||||
| conan config install tools/conan/profiles/%conan_profile% -tf profiles | conan config install tools/conan/profiles/%conan_profile% -tf profiles | ||||||
|  |  | ||||||
|  | @ -4,7 +4,7 @@ | ||||||
| build_dir=${1:-build-debug} | build_dir=${1:-build-debug} | ||||||
| build_type=Debug | build_type=Debug | ||||||
| conan_profile=${2:-scwx-linux_gcc-11} | conan_profile=${2:-scwx-linux_gcc-11} | ||||||
| qt_version=6.8.1 | qt_version=6.8.3 | ||||||
| qt_arch=gcc_64 | qt_arch=gcc_64 | ||||||
| script_dir="$(dirname "$(readlink -f "$0")")" | script_dir="$(dirname "$(readlink -f "$0")")" | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -2,7 +2,7 @@ call tools\setup-common.bat | ||||||
| 
 | 
 | ||||||
| set build_dir=build | set build_dir=build | ||||||
| set conan_profile=scwx-win64_msvc2022 | set conan_profile=scwx-win64_msvc2022 | ||||||
| set qt_version=6.8.1 | set qt_version=6.8.3 | ||||||
| set qt_arch=msvc2022_64 | set qt_arch=msvc2022_64 | ||||||
| 
 | 
 | ||||||
| conan config install tools/conan/profiles/%conan_profile% -tf profiles | conan config install tools/conan/profiles/%conan_profile% -tf profiles | ||||||
|  |  | ||||||
|  | @ -3,7 +3,7 @@ call tools\setup-common.bat | ||||||
| set build_dir=build-release | set build_dir=build-release | ||||||
| set build_type=Release | set build_type=Release | ||||||
| set conan_profile=scwx-win64_msvc2022 | set conan_profile=scwx-win64_msvc2022 | ||||||
| set qt_version=6.8.1 | set qt_version=6.8.3 | ||||||
| set qt_arch=msvc2022_64 | set qt_arch=msvc2022_64 | ||||||
| 
 | 
 | ||||||
| conan config install tools/conan/profiles/%conan_profile% -tf profiles | conan config install tools/conan/profiles/%conan_profile% -tf profiles | ||||||
|  |  | ||||||
|  | @ -4,7 +4,7 @@ | ||||||
| build_dir=${1:-build-release} | build_dir=${1:-build-release} | ||||||
| build_type=Release | build_type=Release | ||||||
| conan_profile=${2:-scwx-linux_gcc-11} | conan_profile=${2:-scwx-linux_gcc-11} | ||||||
| qt_version=6.8.1 | qt_version=6.8.3 | ||||||
| qt_arch=gcc_64 | qt_arch=gcc_64 | ||||||
| script_dir="$(dirname "$(readlink -f "$0")")" | script_dir="$(dirname "$(readlink -f "$0")")" | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Dan Paulat
						Dan Paulat