Merge remote-tracking branch 'origin/dev' into wip/cmake

Bringing in new SHA1s, and updated cmake-specific configurations. Intended for Qt6 Installer essentials package creation. Conflicts coin/platform_configs/default.yaml coin/platform_configs/qt5.yaml Change-Id: I6abc2d952ae75785e34b70977e41018a72acf5bc
2025-12-21 15:38:15 +08:00 · 2020-06-15 13:24:54 +02:00 · 2020-06-03 10:22:36 +02:00 · 2020-05-15 16:14:26 +00:00 · 2020-05-12 17:53:48 +02:00 · 2020-05-12 15:35:45 +00:00
3 changed files with 30 additions and 139 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -48,7 +48,7 @@
 	path = qttranslations
 	url = ../qttranslations.git
 	branch = dev
-	status = essential
+	status = ignore
 	priority = 30
 [submodule "qtdoc"]
 	depends = qtdeclarative qttools
@@ -56,13 +56,13 @@
 	path = qtdoc
 	url = ../qtdoc.git
 	branch = dev
-	status = essential
+	status = ignore
 	priority = 40
 [submodule "qtrepotools"]
 	path = qtrepotools
 	url = ../qtrepotools.git
 	branch = master
-	status = essential
+	status = ignore
 	project = -
 [submodule "qtqa"]
 	depends = qtbase
@@ -310,7 +310,7 @@
 	path = qtquicktimeline
 	url = ../qtquicktimeline
 	branch = dev
-	status = addon
+	status = ignore
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	path = qtquick3d
--- a/coin/platform_configs/default.yaml
+++ b/coin/platform_configs/default.yaml
@@ -1,91 +1,40 @@
 Version: 2
 Configurations:
 -
-    Template: 'qtci-windows-7-x86-3'
-    Compiler: 'Mingw'
-    Features: ['UseLegacyInstructions']
-    Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qt-zlib'
+    Template: 'qtci-macos-10.14-x86_64'
+    Compiler: 'Clang'
+    Features: ['Packaging']
+    Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl'
 -
-    Template: 'qtci-windows-10-x86_64-17'
+    Template: 'qtci-windows-10-x86_64-15'
    Compiler: 'MSVC2019'
-    Features: ['Packaging', 'UseLegacyInstructions']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -headersclean -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
-
-    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
-    Compiler: 'GCC'
-    Features: ['UseLegacyInstructions']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
-
-    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
-    Compiler: 'GCC'
-    Features: ['OutOfSourceBuild', 'Documentation', 'UseLegacyInstructions']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-warnings-are-errors -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
-
-    Template: 'qtci-linux-openSUSE-15.1-x86_64'
-    Target os: 'WebAssembly'
-    Compiler: 'GCC'
-    Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-sql-mysql -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten'
-
-    Template: 'qtci-linux-SLES-15-x86_64'
-    Compiler: 'GCC'
-    Features: ['DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
+    Features: ['Packaging']
+    Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..'
 -
    Template: 'qtci-linux-RHEL-7.6-x86_64'
    Compiler: 'GCC'
-    Features: ['Packaging', 'UseLegacyInstructions']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -headersclean -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -bundled-xcb-xinput -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s'
-
-    Template: 'qtci-macos-10.14-x86_64'
-    Compiler: 'Clang'
-    Features: ['Packaging', 'UseLegacyInstructions']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -headersclean -separate-debug-info -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include'
-
-    Template: 'qtci-macos-10.14-x86_64'
-    Compiler: 'Clang'
-    Features: ['DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include'
-
-    Template: 'qtci-macos-10.14-x86_64'
-    Target os: 'IOS_ANY'
-    Target arch: 'multi'
-    Compiler: 'Clang'
-    Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang'
+    Features: ['Packaging']
+    Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
 -
    Template: 'qtci-linux-RHEL-7.6-x86_64'
    Target os: 'Android_ANY'
-    Target arch: 'multi'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host linux-x86_64'
-
-    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
-    Target os: 'QEMU'
-    Target arch: 'armv7'
-    Compiler: 'GCC'
-    Features: ['UseLegacyInstructions']
-    Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/libexec/gstreamer-1.0/gst-plugin-scanner']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib'
-
-    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
-    Target os: 'QEMU'
    Target arch: 'arm64'
    Compiler: 'GCC'
-    Features: ['UseLegacyInstructions']
-    Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/libexec/gstreamer-1.0/gst-plugin-scanner']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib'
+    Features: ['Packaging']
+    Target compiler: 'Clang'
+    Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
+    Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}']
 -
-    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
-    Target os: 'QEMU'
-    Target arch: 'mips64'
-    Compiler: 'GCC'
-    Features: ['DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-mips64/sysroots/mips64r2-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-mips64/sysroots/mips64r2-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib'
+    Template: 'qtci-macos-10.14-x86_64'
+    Target os: 'IOS_ANY'
+    Target arch: 'arm64'
+    Compiler: 'Clang'
+    Features: ['Packaging']
+    Target compiler: 'Clang'
+    Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl'
+    Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON']
 -
-    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
-    Compiler: 'GCC'
-    Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
+    Template: 'qtci-windows-7-x86-3'
+    Compiler: 'Mingw'
+    Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF'
+    Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}']
--- a/coin/platform_configs/qt5.yaml
+++ b/coin/platform_configs/qt5.yaml
@@ -1,64 +1,6 @@
 Version: 2
 Configurations:
-
-    Template: 'qtci-windows-7-x86-3'
-    Compiler: 'Mingw'
-    Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH']
-    Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib'
-
-    Template: 'qtci-windows-10-x86_64-17'
-    Compiler: 'Mingw'
-    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
-    Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib'
-
-    Template: 'qtci-windows-10-x86_64-17'
-    Target os: 'Android_ANY'
-    Target arch: 'multi'
-    Compiler: 'Mingw'
-    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
-    Target compiler: 'Clang'
-    Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20'
 -
    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
    Compiler: 'GCC'
-    Configure arguments: '-DBUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
-
-    Template: 'qtci-linux-openSUSE-15.1-x86_64'
-    Compiler: 'GCC'
-    Configure arguments: '-DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
-
-    Template: 'qtci-macos-10.14-x86_64'
-    Compiler: 'Clang'
-    Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl'
-
-    Template: 'qtci-windows-10-x86_64-15'
-    Compiler: 'MSVC2019'
-    Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..'
-
-    Template: 'qtci-linux-RHEL-7.6-x86_64'
-    Compiler: 'GCC'
-    Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
-
-    Template: 'qtci-linux-RHEL-7.6-x86_64'
-    Target os: 'Android_ANY'
-    Target arch: 'arm64'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
-    Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}']
-
-    Template: 'qtci-macos-10.14-x86_64'
-    Target os: 'IOS_ANY'
-    Target arch: 'arm64'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl'
-    Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON']
-
-    Template: 'qtci-windows-7-x86-3'
-    Compiler: 'Mingw'
-    Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF'
-    Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}']
+    Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
Author	SHA1	Message	Date
Alexandru Croitor	5ef4ad5e90	Merge remote-tracking branch 'origin/dev' into wip/cmake Bringing in new SHA1s, and updated cmake-specific configurations. Intended for Qt6 Installer essentials package creation. Conflicts coin/platform_configs/default.yaml coin/platform_configs/qt5.yaml Change-Id: I6abc2d952ae75785e34b70977e41018a72acf5bc	2020-06-15 13:24:54 +02:00
Alexandru Croitor	a2dc8d6c21	Merge remote-tracking branch 'origin/dev' into wip/cmake Bringing in new SHA1s, while keeping wip/cmake's own configurations. Intended for Qt6 Installer essentials package creation. Conflicts coin/platform_configs/default.yaml Change-Id: I40e26301cf10c3c7bd8b0b4dc11cc47eedc1700e	2020-06-03 10:22:36 +02:00
Alexandru Croitor	318d651b44	CMake: Update configurations and modules similar to the ones in dev Change-Id: Ia47878715b27c265b00982c71f36ffc5fe1f44d4 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>	2020-05-15 16:14:26 +00:00
Alexandru Croitor	747657c00c	Merge remote-tracking branch 'origin/dev' into wip/cmake Conflicts: coin/platform_configs/default.yaml coin/platform_configs/qt5.yaml Change-Id: Ic4ed934ea7015dc66472ab2f9dd45844b25522b8	2020-05-12 17:53:48 +02:00
Alexandru Croitor	70bfcf5198	Update configurations and repositories to allow cmake binary packaging Disable qt5.git builds of repositories that have not been ported to CMake yet. Remove qmake configurations from qt5.yaml and default.yaml. Add cmake configurations to qt5.yaml. Add the Packaging feature to them. Keep one configuration in qt5.yaml, because it's apparently illegal to have it empty All of this to test out if the binary package creation process can work with the cmake artifacts. Change-Id: Iebb6c4303fa2104765a7b0a71489560afe7df244 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <hausmann@gmail.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2020-05-12 15:35:45 +00:00
Alexandru Croitor	7127f57038	Merge remote-tracking branch 'origin/dev' into wip/cmake This merge discards all content that was in wip/cmake, and brings in all content from dev, aka both have the same content now (as original dev). This is in preparation for switching the Packaging feature in configurations, to allow packaging of cmake built artifacts for the binary installers. Change-Id: I048a53586681b12917fd3757acf23d3b47a88ac1	2020-04-24 10:59:37 +02:00
Leander Beernaert	a1fc3dbef8	Update Qt5 with new metatype dependency handling Change-Id: If930e75b62ed94c773a2beb7e6935f4e323e7245 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>	2020-02-11 09:49:03 +00:00
Qt Submodule Update Bot	8eb6addbc0	Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I4efc58e962fc2a153248d05b8bbaa628fb32f159 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>	2020-02-07 17:15:16 +00:00
Qt Submodule Update Bot	f174d30f6d	Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I8d4281a0e271148c92e7a0ab963505d93bf85eb1 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>	2020-02-06 11:57:34 +00:00
Qt Submodule Update Bot	988775f828	Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I7026eb2bf6da3143d0e1825bd287070aeb1a7028 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Qt CMake Build Bot	2020-02-02 12:15:02 +00:00
Alexandru Croitor	13866b01d7	Build Windows configurations with debug information Change-Id: Iff1132d9a2718c151a2eae00df72396bc16e34cb Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2020-01-31 19:50:51 +00:00
Eike Ziller	f25f9e1328	Update CMake provisioning to latest No need to use a release candidate anymore. CMake 3.16.3 is the current latest. Change-Id: I93b15d36856a50b8badb75b6fc2a9a885752b5b2 Reviewed-by: Liang Qi <liang.qi@qt.io>	2020-01-31 12:19:04 +00:00
Alexandru Croitor	d30d1e6308	Update qt5.git wip/cmake with new qtbase and qtdeclarative And disable qtquickcontrols2 because it doesn't currently build in dev either. Change-Id: I7122224fae16fcfad1ac13f60a5826beb73c6106 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2020-01-31 08:21:57 +00:00
Liang Qi	6b60200b7f	Fix .gitmodules to use correct branch This amends `31d83f1ddb`. Change-Id: Id376f4f079cdc114095955cbf61a74d63a5b3af5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>	2020-01-27 12:35:06 +00:00
Leander Beernaert	31d83f1ddb	Update submodules and disable some failing repositories Until dev is fixed, we disable some of the broken repos in the qt5 wip/cmake branch: qttools, qtremoteobjects, qtscxml, qtwebsockets, qtwinextras. Also switch Windows to be built in Release mode, to circumvent some issues with Debug builds that are also present in dev. Note qmake builds in Coin also only build Release builds of Windows for testing. Change-Id: Ie095fa16920fb6bd92db80118abeb6b282c96897 Reviewed-by: Qt CMake Build Bot Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>	2020-01-27 08:22:18 +00:00
Qt Submodule Update Bot	872c905004	Update submodules on 'wip/cmake' in qt/qt5 Change-Id: Idebe0a35e89997fba13ac1bf25f498192b58d923 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Qt CMake Build Bot	2020-01-23 06:18:04 +00:00
Qt Submodule Update Bot	efe31b61a8	Update submodules on 'wip/cmake' in qt/qt5 Change-Id: If1f1632c4032c2214c3be5f6bfc4105f71669eba Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>	2020-01-18 08:55:45 +00:00
Alexandru Croitor	94f9d3e7da	Add a macOS non-framework build to Coin Keep it for now, so we don't introduce breakages there now that the framework build is the default config. Make it a developer build. Change-Id: Ib92bd4935937a7965630837ce7de369a0340fd9f Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2020-01-16 09:40:46 +00:00
Qt Submodule Update Bot	e7f83d3965	Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I772c45349591464651967f6af6768da7b5bc8488 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>	2020-01-14 07:03:06 +00:00
Qt Submodule Update Bot	0412433d78	Update submodules on 'wip/cmake' in qt/qt5 Change-Id: Ibdff612fbed373a813ca3add2a00a6c06016f64d Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>	2020-01-11 10:09:19 +00:00
Leander Beernaert	b01225fb32	Read module list from .gitmodules This patch mimics the behavior of qt.pro, where the module list is extracted from the .gitmodules file and then topologically sorted based on the modules dependencies. This patch also introduces a small check to make sure all the required dependencies are met and will be built. Change-Id: Idd3df9b618805ca0b2347eac57aaa39c1bcdb3dd Reviewed-by: Qt CMake Build Bot Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>	2020-01-10 14:49:51 +00:00
Qt Submodule Update Bot	79bdf27954	Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I17a3efcedb0bffc5a2cbfb8ed091c6c2448c4706 Reviewed-by: Qt CMake Build Bot Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>	2020-01-10 13:00:18 +00:00
Liang Qi	6ee5857ec8	Add macextras to the qt5 build Change-Id: I16b1ca99bff69f203aea27b144c537f2834b1620 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>	2020-01-09 19:32:17 +00:00
Kevin Funk	7509458d5f	Start the CMake superbuild Also import and use ECMOptionalAddSubdirectory.cmake to add other module's as subdirectories, in case the directories exist. Additionally this module allows to disable the build of submodules by passing e.g. BUILD_qtsvg=OFF. This probably needs more though on how to hande the intermodule dependencies, but it's a start. Task-number: QTBUG-75582 Change-Id: Ic3de9711d9b865b2d96bdaee0089f570408b9693 Reviewed-by: Qt CMake Build Bot Reviewed-by: Cristian Adam <cristian.adam@qt.io>	2020-01-08 13:11:16 +00:00
Qt Submodule Update Bot	1f017ffbff	Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I7a522eaf1449708afa1c1b965c23eded7f769c61 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>	2020-01-08 12:50:53 +00:00
Qt Submodule Update Bot	0f361744ed	Update submodules on 'wip/cmake' in qt/qt5 Change-Id: I451ad6e95b4167ff1cfd61856019d1e3dbc2d283 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>	2020-01-07 14:37:29 +00:00
Alexandru Croitor	0a3a855774	Build an iOS configuration in Coin Install ninja from homebrew. Provision freetype and pcre2 for host builds, like in the macOS 10.13 case. Provision homebrew gcc 9 to build vcpkg. We can't use Xcode 11 clang to build vcpkg, because std::filesystem is only implemented for macOS 10.15, so the deployment target needs to be 10.15, and we don't have any 10.15 VMs currently. Whereas the std::filesystem implementation provided by gcc can work on lower macOS versions. When building vcpkg using the Xcode default provided system headers, the build will fail with the following error: stdio.h:222:7: error: conflicting declaration of 'char* ctermid(char*)' with 'C' linkage _ctermid.h:26:10: note: previous declaration with 'C++' linkage The Xcode SDK is missing some C++ headers. Usually these are installed manually via an additional step like the one below, but only after installing the command line tools. sudo installer -pkg /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg -target / Apparently not all command line tool packages ship this extra header package, so instead switch the active toolchain to the CLT via xcode-select -p, which seems to always have the necessary headers (at least from my testing). That's why we use the CLT for vcpkg. Bootstrap vcpkg, and install the iOS 3rd party packages using vcpkg. Finally add a configuration to build qtbase targeting iOS. Task-number: QTBUG-75576 Change-Id: Idec885d62b12f96c4830b9ec02b63a89b9cc7b8c Reviewed-by: Dimitrios Apostolou <jimis@qt.io> Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>	2019-12-17 20:45:05 +00:00
Leander Beernaert	66d9087cf5	Update QtTools submodule This is required for QtTranslations to work properly. Change-Id: I0e8373b4199eb8bdc5e4f7a9429056c58847c262 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-12-17 10:52:22 +00:00