Commit Graph

4070 Commits

Author SHA1 Message Date
Liang Qi
a4b68d6b7d Set Boot2Qt arm builds to release and developer build
Task-number: QTBUG-63152
Change-Id: Id6f2411d6339b7bd1ccb261cf5d9bebe1d0ada1c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-06-04 14:35:23 +02:00
Alexandru Croitor
33e8275ee5 Revert "CMake: Enable CMake builds for qtqa"
Revert the change because the qtqa instructions have been
temporarily removed to unblock other branches.

This reverts commit a10584e57c.

Change-Id: I76646026b099d3b039eec6cdaecfbbce6df43aa2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-06-04 10:13:24 +02:00
Tony Sarajärvi
4c7fe602cb Fix compiler mentioned for host tool building in RHEL
This is only a cosmetic fix. That value is not used anywhere anymore.

Task-number: QTQAINFRA-3757
Change-Id: Iabba6202e7ddbb08e58901a591ba0171e8dd1fc9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-06-04 06:51:45 +00:00
Jean-Michaël Celerier
3f95e2b019 qt3d: add shadertools to "recommends" modules
This is needed for Qt3D's RHI support.

Change-Id: I416ee986db06479775a4dd4251261ecaac805b73
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-06-03 07:22:22 +00:00
Alexandru Croitor
a10584e57c CMake: Enable CMake builds for qtqa
Only includes one MinGW configuration, to mirror what Coin does
with the qmake builds of qtqa.

Switching the Coin instructions to do license checking and binary
compatibility testing using CMake will require a different change.
Most likely this change will have to wait until all of qt5.git/dev
is moved to use yaml instructions for building, rather than the
hardcoded instructions provided by Coin.

Besides, the binary compatibility test still depends on finding
qmake to run its test, which might have to be changed in the future.

Task-number: QTBUG-84233
Change-Id: I5ab7120e965f7729968697abf9e0db602c216cd9
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-06-02 21:19:42 +02:00
Alexandru Croitor
91a164b838 CMake: Enable CMake builds for qtquicktimeline
Task-number: QTBUG-82967
Change-Id: I94324d4ef7d9d393e06a04e2eb1bfb0f9caab971
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-06-02 14:49:21 +02:00
Tony Sarajärvi
b0d9b22f53 Combine two macOS targets that are nearly the same
Change-Id: I1c094f02d1cee059272680941b355e4fb2bbdd31
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-05-29 09:21:21 +00:00
Joerg Bornemann
4d99fb00cc Fix CMake provisioning for Ubuntu 18.04 x86_64 QEMU armv7
This amends 68134db4.

Change-Id: I2eed240464f1b29c119ca0119001997aefdecd41
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2020-05-27 08:06:16 +02:00
Alexandru Croitor
68134db435 Update provisioned CMake version to 3.17.2
This should fix the ninja deps issue we had on Windows with the
Ninja Multi-Config generator, where calling ninja a second time to
rebuild the project failed.

More details at https://gitlab.kitware.com/cmake/cmake/-/issues/20723

Change-Id: I0029e57fbc704120d2241499a87cad0ad40c2e50
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-05-26 21:57:20 +02:00
Alexandru Croitor
0685312d2e CMake: Add MinGW config to all cmake enabled repositories
Task-number: QTBUG-75578
Change-Id: I4957efff9f3438c85f9e653130898d4b60a555ba
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-05-25 21:04:48 +02:00
Alexandru Croitor
5cd8e9576d CMake: Switch qtbase Windows config to use Ninja Multi-Config
And configure with two configurations, RelWithDebInfo and Debug.
This is equivalent to qmake's
--debug-and-release --force-debug-info

This should give us minimal coverage for debug-and-release builds,
as well as avoid regressions with NMC aka multiple configurations.

If the qtbase builds successfully, we can try to extend the rest of
the repositories to also build with NMC on Windows.

We can't add such a configuration to macOS for now, because it
requires CMake 3.18, which is not released yet.

Disable PCH because it seems to fail the build when used together
with Ninja Multi-Config.

Task-number: QTBUG-80900
Change-Id: I71a9584ddb1d48ed22925f67b50891e102036c97
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-05-25 13:41:38 +02:00
Tasuku Suzuki
598f82300a Remove the qtquickcontrols2 dependency on qtgraphicaleffects
The Material style uses its own shader effects, and
recent patches did the same for the Imagine style.
There were some auto tests that have been made to only
run if qtgraphicaleffects is available.

Change-Id: Ifcfcad9591d2a0a8d5ebed505566cd0103dd9176
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2020-05-23 00:47:42 +00:00
Heikki Halmet
fa58a227cd Provisioning: Change resolution for Windows 10 x86_64
Currently we have wrong resolution (1024x768) for 64-bit Windows.
Correct one is 1280x800

Change-Id: Ifc17933a5901681a917f973cab4d7c1ca1dfbd9f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-05-22 12:23:34 +03:00
Alexandru Croitor
afc08c23ca CMake: Enable CMake builds for qttranslations
Fixes: QTBUG-82969
Change-Id: I17e7df82f578338d6c1e3dbc41677d4302d9689b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-05-20 14:48:59 +02:00
Liang Qi
434e2712aa Update submodules on 'dev' in qt/qt5
Change-Id: Idd8c485848379879aa3d870ddf9740eab2fb95d3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-05-20 13:37:23 +02:00
Alexandru Croitor
71a559e748 CMake: Enable CMake builds for qtdoc
Change-Id: Idca63aef8951a4a104b816e4aac710225d1279c2
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-05-14 13:25:23 +02:00
Lars Knoll
688187773b Explicitly enable -headersclean on some configs
This is in preparation to turning this off by default in configure,
as it increases build times significantly.

Change-Id: I2d601595ce8c093765194f36ec5235f79dd4dd7d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-05-13 22:17:58 +02:00
Alexandru Croitor
3384823666 Revert "Temporarily ignore qtnetworkauth"
The qtnetworkauth test was fixed, so we can re-enable the module.

Bump the sha1 to the latest version of qtnetworkauth.

This reverts commit a8d3591327.

Task-number: QTBUG-84071
Change-Id: I68c953fa97cf0f28a391b496fb321aefe9d8e7d6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-05-13 11:47:37 +02:00
Alexandru Croitor
e4d60dd117 CMake: Enable CMake builds for qtvirtualkeyboard
Task-number: QTBUG-78185
Change-Id: Ie8a120aa3425edf6ae18f4a43dcd3f6aa697cd9f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-05-12 13:18:00 +02:00
Alexandru Croitor
29c9ba1835 CMake: Switch to MinGW 8.1 configuration for the qtbase CMake build
Change-Id: I974d34a33370ece9f9e240ba6e5106cc50d8bf84
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-05-12 13:02:52 +02:00
Liang Qi
a8d3591327 Temporarily ignore qtnetworkauth
Task-number: QTBUG-84071
Change-Id: I8486c55dc7062f50e7722b03031750b58be23a1f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-05-07 21:52:26 +02:00
Alexandru Croitor
3652f77aa3 Provisioning: Set macOS locale to "en_US.UTF-8"
The 419f42903154489e2dace8d1eba183036275448b commit in qtbase
introduced a regression where the tst_fusion test in qtqtuickcontrols2
hits a deadlock while trying to print a warning about a non-UTF-8
locale.

The warning is due to the fact that the agent executed in Coin's VM
does not have an explicit locale set, and thus it defaults to "C".
There is no explicit locale set in any .bashrc (or similar files),
and neither in any launchd configuration (because the agent is
executed at macOS startup via launchd).

The deadlock is due to trying to acquire the same lock twice while
trying to write output to stdout.

The test only deadlocks on CMake configurations, and not qmake
configurations, because Coin has a hardcoded instruction to set the
locale to UTF-8 when running qmake tests.

Until the deadlock situation is addressed in another change, the issue
can be fixed by setting the macOS configuration locale to UTF-8
explicitly, by assigning the LANG environment variable
into ~/.bashrc at provisioning time, like we do with other environment
variables like PATH.

Fixes: COIN-578
Change-Id: Ib6a5849a6868c1776dd425aeb8b5e7d6faa8cde0
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2020-05-07 21:52:16 +02:00
Alexandru Croitor
9f4a39356a CMake: Switch host macOS configurations to framework release builds
Also include debug info. This is the equivalent of qmake's
--release --framework --force-debug-info --separate-debug-info

Change-Id: I2778b4998890146c82552f9c721a48174a764839
Reviewed-by: Simon Hausmann <hausmann@gmail.com>
2020-05-04 22:50:17 +02:00
Alexandru Croitor
4dace06297 CMake: Enable a MinGW 7.3 CMake qtbase configuration
It should be a developer build, but due to some features
that are not ported in src/gui/configure.cmake (directwrite)
there are compilation errors due to unused arguments in
static bool QWindowsFontDatabaseBase::init(QSharedPointer)
in platformsupport/fontdatabases/windows/qwindowsfontdatabasebase.cpp

So it's not a developer build for now.

Task-number: QTBUG-75578
Change-Id: Ieb6daca45473ea42748a39f3e9e33a9db087a0e0
Reviewed-by: Simon Hausmann <hausmann@gmail.com>
2020-05-04 18:01:22 +02:00
Liang Qi
54c94ae681 Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
	.gitmodules
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtwebkit.yaml
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh

Change-Id: If6b0f7a671a69d6a2444ee4d26b324e4d269970c
2020-04-30 18:35:08 +02:00
Qt Submodule Update Bot
ff4a1141f2 Update submodules on 'dev' in qt/qt5
Change-Id: I96f194ffeecc40522b5ed69b0bd2d2e03045cfd9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-04-30 15:44:59 +02:00
Simon Hausmann
3265e93168 Try to build qtbase with cmake against Yocto
This adds the basic armv7 configuration and passes through two
additional variables for use in the build instructions:

    * QT_YOCTO_ENVSETUP points to the environment-setup script that the
    Yocto SDK expects to be sourced before building against the target
    sysroot.

    * QT_CMAKE_DIR points to the directory that contains our cmake
    installation. Since the environment-setup prepends the Yocto host
    bin dir to the PATH, we'd end up picking the wrong cmake.

Also the choice of system Harfbuzz is disabled as Qt does not build
against the version shipping in Yocto.

Change-Id: I8d657e773143c4db0e2437d029d62372f7b7e638
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-04-30 12:02:42 +02:00
Heikki Halmet
5f03b84e65 Provisioning: Add sleep before killing gpg-agent in msys installation
Task-number: QTQAINFRA-3691
Change-Id: If84fd2d0d1cd6dccadf21cbf688aca6182cdd920
Reviewed-by: Simo Fält <simo.falt@qt.io>
2020-04-30 11:05:15 +03:00
Alexandru Croitor
4aa9c4df11 CMake: Enable CMake builds for qtquick3d
Change-Id: I9547c73e8a632754d043bff8c72c29c18449bfd9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-04-27 10:04:09 +02:00
Qt Submodule Update Bot
20668c9233 Update submodules on '5.15' in qt/qt5
Change-Id: Ia0fb6c1f5f1ae1dafaf0999fdc7c1cc5ba765bf2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-26 23:45:55 +02:00
Qt Submodule Update Bot
230e99400c Update submodules on '5.15' in qt/qt5
Change-Id: I6dd7a38815ff1bd13b3b8d1c9a4042c3b0981784
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-24 23:46:00 +02:00
Liang Qi
5b018f96af Update submodules on '5.15' in qt/qt5
Change-Id: I06f83013c085e342e8391a705ba5ecf156bd5159
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-04-24 15:59:44 +02:00
Liang Qi
cc4fdea014 Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
	.gitmodules
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtsdk.yaml
	coin/platform_configs/tqtc-qt-rta.yaml
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh

Change-Id: I2221262edc024e0aa11b9dab4d08c2df3a0b53b0
2020-04-24 15:31:01 +02:00
Qt Submodule Update Bot
ac8b28db57 Update submodules on '5.14' in qt/qt5
Change-Id: I919625c0e3a2fdd5dea9dab691c9bc96f62161fa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-24 09:48:03 +02:00
Liang Qi
882294edc3 Merge remote-tracking branch 'origin/5.14.2' into 5.14
Conflicts:
	.gitmodules

Change-Id: I950588f85d1b39ba6ce994821db9f340b72fa6d2
2020-04-23 12:27:46 +02:00
Qt Submodule Update Bot
10e07c7877 Update submodules on '5.14' in qt/qt5
Change-Id: Ibdc80d4d7abad334e96f6c5d7c602e42a9d1b31f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-23 10:32:55 +02:00
Qt Submodule Update Bot
285f2c5690 Update submodules on '5.15' in qt/qt5
Change-Id: I62fa79986a2ccbf3ee4e000f4f767731bf31fd2e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-04-23 06:02:52 +02:00
Qt Submodule Update Bot
4d435697fa Update submodules on '5.15' in qt/qt5
Change-Id: I0c4e65146b752463190fc98e9f670c3b00eac283
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-21 23:46:35 +02:00
Allan Sandfeld Jensen
ca914bdbf3 Fix qtwebwengine.yaml
Missing an initial separator

Change-Id: I1f447963fbaa93027cfffd7c320efc69ea4a1107
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-04-21 16:46:47 +02:00
Qt Submodule Update Bot
133403b829 Update submodules on '5.15' in qt/qt5
Change-Id: Ic1acfd2ae08a13f88e45e822a34b673e7470aa72
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-21 10:57:24 +02:00
Allan Sandfeld Jensen
9b7a95964d Add qtwebengine.yaml
We can't build the wasm version of qtbase any longer

Change-Id: I7436640941702ba2479c7e73f3d1d9ccaf2e7709
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-04-21 10:02:36 +02:00
Volker Hilsheimer
82ed571cde Add Pick-to footer for cherry-pick bot to commit template
Change-Id: Idec00573bdbebda4d3b3481eee480c91c5d8d1de
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-04-20 11:04:27 +02:00
Qt Submodule Update Bot
30b0878b18 Update submodules on '5.15' in qt/qt5
Change-Id: I53ce054fd386e55c6b9b0954c8636716a4ae08b3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-17 23:46:29 +02:00
Qt Submodule Update Bot
cafd0f0019 Update submodules on '5.14' in qt/qt5
Change-Id: Ifdae4eace5516c6b2886560c7c5da46954b8e712
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-17 22:31:06 +02:00
Qt Submodule Update Bot
908afb868a Update submodules on '5.15' in qt/qt5
Change-Id: I9c627825712c1c2bc196a8e0d3259189aa43d71b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-16 23:46:26 +02:00
Qt Submodule Update Bot
4d3751fe3b Update submodules on '5.15' in qt/qt5
Change-Id: I2229401bd16f8f5a5f99f0b92c1ea29d03a661d9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-15 23:46:40 +02:00
Mårten Nordheim
176d9ce09c Don't manually rerun conan Run-Conan-Install
Modern conan will retry downloads on its own. Change default number of
attempts to 5 for more reliability.

Change-Id: Iafd4845b31c3e5fb296ba0b897cbf2030c412b04
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
v5.15.0-beta4
2020-04-15 09:53:44 +03:00
Rami Potinkara
08b99e8def qdb building for mac
Modified qdb.yaml and created and pkgconfig and libusb relates .sh
files so that QDB can be build for Mac OS due to USB Ethernet CDCECM enabling.

Task-number: QTBUG-82531
Change-Id: Ia5f970e5940b7d9116831c8174db0ea1b9231234
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2020-04-15 08:28:12 +03:00
Heikki Halmet
61267a7a78 Provisioning: Remove notifications and warnings from macOS
Notifications and warnings in UI might affect RTA and autotests results

Change-Id: I447dab3ba839d2c577f633cbf96fc7f3e5fdfe25
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
2020-04-14 14:21:19 +03:00
Qt Submodule Update Bot
8a5938bd22 Update submodules on '5.15' in qt/qt5
Change-Id: Ie44a49c9f1d432865b37297323418c0a831b502c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-04-14 10:16:53 +03:00