mirror of
git://code.qt.io/qt/qt5.git
synced 2026-01-05 22:46:55 +08:00
Conan: Update build profiles
Remove mutually exclusive options. Set the 'build_type' correctly so that it reflects the used build Options. Pick-to: 6.2 Change-Id: I40b139898d722583c0fc245f3f8c60657a42d26a Reviewed-by: Toni Saario <toni.saario@qt.io>
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
compiler=clang
|
||||
compiler.version=10
|
||||
compiler.libcxx=libstdc++
|
||||
build_type=Release
|
||||
build_type=RelWithDebInfo
|
||||
[options]
|
||||
qtbase:release=yes
|
||||
qtbase:shared=no
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
compiler=gcc
|
||||
compiler.version=9.3
|
||||
compiler.libcxx=libstdc++11
|
||||
build_type=Release
|
||||
build_type=RelWithDebInfo
|
||||
[options]
|
||||
qtbase:release=yes
|
||||
qtbase:shared=yes
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
compiler=apple-clang
|
||||
compiler.version=12.0
|
||||
compiler.libcxx=libc++
|
||||
build_type=Release
|
||||
build_type=RelWithDebInfo
|
||||
[options]
|
||||
qtbase:release=yes
|
||||
qtbase:shared=yes
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
compiler=clang
|
||||
compiler.version=11
|
||||
compiler.libcxx=c++_shared
|
||||
build_type=Release
|
||||
build_type=RelWithDebInfo
|
||||
[options]
|
||||
qtbase:release=yes
|
||||
qtbase:shared=yes
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
compiler=clang
|
||||
compiler.version=11
|
||||
compiler.libcxx=c++_shared
|
||||
build_type=Release
|
||||
build_type=RelWithDebInfo
|
||||
[options]
|
||||
qtbase:release=yes
|
||||
qtbase:shared=yes
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
compiler=clang
|
||||
compiler.version=11
|
||||
compiler.libcxx=c++_shared
|
||||
build_type=Release
|
||||
build_type=RelWithDebInfo
|
||||
[options]
|
||||
qtbase:release=yes
|
||||
qtbase:shared=yes
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
compiler=clang
|
||||
compiler.version=11
|
||||
compiler.libcxx=c++_shared
|
||||
build_type=Release
|
||||
build_type=RelWithDebInfo
|
||||
[options]
|
||||
qtbase:release=yes
|
||||
qtbase:shared=yes
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
compiler=clang
|
||||
compiler.version=11
|
||||
compiler.libcxx=c++_shared
|
||||
build_type=Release
|
||||
build_type=RelWithDebInfo
|
||||
[options]
|
||||
qtbase:release=yes
|
||||
qtbase:shared=yes
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
compiler=clang
|
||||
compiler.version=11
|
||||
compiler.libcxx=c++_shared
|
||||
build_type=Release
|
||||
build_type=RelWithDebInfo
|
||||
[options]
|
||||
qtbase:release=yes
|
||||
qtbase:shared=yes
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
compiler=clang
|
||||
compiler.version=11
|
||||
compiler.libcxx=c++_shared
|
||||
build_type=Release
|
||||
build_type=RelWithDebInfo
|
||||
[options]
|
||||
qtbase:release=yes
|
||||
qtbase:shared=yes
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
compiler=clang
|
||||
compiler.version=11
|
||||
compiler.libcxx=c++_shared
|
||||
build_type=Release
|
||||
build_type=RelWithDebInfo
|
||||
[options]
|
||||
qtbase:release=yes
|
||||
qtbase:shared=yes
|
||||
|
||||
@@ -4,9 +4,8 @@
|
||||
compiler=gcc
|
||||
compiler.version=8.1
|
||||
compiler.libcxx=libstdc++
|
||||
build_type=Release
|
||||
build_type=RelWithDebInfo
|
||||
[options]
|
||||
qtbase:release=yes
|
||||
qtbase:shared=yes
|
||||
qtbase:debug_and_release=yes
|
||||
qtbase:force_debug_info=yes
|
||||
|
||||
@@ -6,9 +6,8 @@
|
||||
compiler.cppstd=17
|
||||
compiler.runtime=dynamic
|
||||
compiler.runtime_type=Release
|
||||
build_type=Release
|
||||
build_type=RelWithDebInfo
|
||||
[options]
|
||||
qtbase:release=yes
|
||||
qtbase:shared=yes
|
||||
qtbase:nomake=tests
|
||||
qtbase:debug_and_release=yes
|
||||
|
||||
Reference in New Issue
Block a user