Commit Graph

3806 Commits

Author SHA1 Message Date
Simon Hausmann
2a64418358 Transition to macOS 10.14 step 1
We want to run all tests on macOS 10.14, which requires some more fixes
in qtquickcontrols2. That however isn't passing due to unrelated changes
in base/declarative blocking us from moving forward. So to decouple the
two, this change limits macOS tests to qtbase and declarative but on
10.14. This will allow us to switch qtbase over to C++17 and once we've
got qqc2 updated in qt5.git, we can globally re-enable tests for 10.14.

Task-number: QTQAINFRA-3108
Change-Id: I0f835a1da87187c6bb69e3d4019196e1411095fd
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-02-04 16:54:05 +01:00
Alexandru Croitor
25e0073720 Use legacy instructions when building all qmake configurations
This change is preparation for merging qtbase wip/cmake -> dev,
because that will bring in the new yaml instructions on how
to build the CMake configurations, which means that legacy
instructions provided by Coin itself need to be used for all
the existing qmake configurations.

Change-Id: I7005835719b83b7186138292a2e1baf4d2a4a3e0
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-02-03 14:15:33 +01:00
Simon Hausmann
486139715b Disable warnings-are-errors for the doc build
We're not really interested in catching the C++ warnings at this late
stage (Qt5 build), especially not for building documentation.

Change-Id: I48c621ce6de199de61fab8de6517f4c0b099bf11
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-01-31 12:38:45 +01:00
Lars Knoll
a23bc16dcc Remove wasm on windows for now
The compiler fails to pass the c++14 configure test.

Change-Id: I2253d1654eda19351154467cd3b076ba726c10d7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-01-31 12:38:45 +01:00
Qt Submodule Update Bot
09a78c7e84 Update submodules on 'dev' in qt/qt5
Change-Id: I16a797f24169c42eb1b11f9d62905c687af7da4f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-01-31 12:38:45 +01:00
Laszlo Agocs
5b56192bc1 Add qtshadertools as a submodule in dev
Task-number: QTBUG-78589
Change-Id: I64da5b9f46ace924e3dd24a1ea062379450f8ca3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-01-31 12:38:45 +01:00
Simon Hausmann
3c6f8b1af5 Re-add qtimageformats
Qt Quick Controls 2 styles use webp, which in turn is instantiated by
tests.

Change-Id: I7a9a98f96beecb1f214e9e2caef0062a5716d31e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-01-30 09:26:13 +01:00
Simon Hausmann
24d977a188 Reduce the set of modules for Qt6 development
Change the amount of modules that are tested together by the CI (and
then used for initial Qt 6 snapshots) to the core essential modules. All
others are set to "ignore" and the objective is to bring them back later
when qtbase/declarative/quick3d development has settled.

Notable exceptions are svg and graphicaleffects due to their strong
dependency from qtvirtualkeyboard as well as qtquickcontrols2.

Change-Id: I972d7b353add1f5dbad5104ce84c4cc5b8c6f616
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-01-29 10:39:01 +01:00
Lars Knoll
4c55e1cfa7 Remove ICC from our list of tested platforms for now
ICC 18 doesn't support C++17, so let's remove it.

Change-Id: If87010fe73111324f78ccd26f25e55ec7e6afbca
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-01-28 12:23:36 +01:00
Lars Knoll
4e4e7a9679 Update macOS WebAssembly and Android builds to use 10.14
macOS 10.13 doesn't support C++17, and will get removed soon.

Change-Id: I5ed50df99d8582349adfd04e59ce89dd49701f76
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-01-27 15:41:37 +01:00
Lars Knoll
b2f62bb906 Remove QNX configs from CI
Those configurations don't support a C++17 compliant compiler.

Fixes: QTBUG-81576
Change-Id: I87499e21e7532856fdd4c41b1e162e3566d5f130
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
2020-01-27 15:41:26 +01:00
Simon Hausmann
0b32ba9924 Re-remove WinRT configurations
They were originally removed in commit
5677a43a25 but re-added through a merge.

Change-Id: I821fb955745dfc5e982cdbf2264af3345ec03252
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-01-22 15:39:32 +01:00
Paul Wicking
bd0943bf50 Update _clang-format definition
Add indentation for preprocessor directives if/ifdef/endif
as this is commonly used across Qt.

Change-Id: I0ce9851cc0861b8d18cb3717d695c871169db239
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2019-12-18 09:55:55 +01:00
Simon Hausmann
68c8693e5b Merge remote-tracking branch 'origin/wip/cmake' into dev
This merges merely the provisioning changes needed to perform cmake
builds in the CI. The platform configuration changes will be applied
incremental as we merge support in the individual modules.

 Conflicts:
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh

Added ninja to
coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh
just to force re-provisioning.

Removed module_config.yaml because that breaks license check in
qmake builds.

Change-Id: Ic074c0c881404f4361e61f66130c0cb07f5e8b84
2019-12-13 14:58:08 +01:00
Alexandru Croitor
3aef268464 Update vcpkg snapshot
The snapshot uses the previous snapshot as a based. It was rebased
on latest master as of 2019-12-05, and also contains cherry-picked
patches to target iOS.

Change-Id: I9fc0c39856fdb255533f6c71d27f5749894b6bea
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-12-11 20:58:03 +00:00
Qt Submodule Update Bot
bbe2ca1f14 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Ia8dbab68e5a7dd4f136e6345d6c1da9705d4be69
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-12-11 02:31:30 +00:00
Qt Submodule Update Bot
d47213e974 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I8a50e284b785b7441826ed4f199a5db4c2be6f6e
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-12-10 05:06:00 +00:00
Qt Submodule Update Bot
f38665a06a Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I0c29a5b3944a20d6652c0c8cb1199abae9683f93
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-12-07 21:58:23 +00:00
Liang Qi
2d6f569ee9 Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ia67f4be8c51a2bd0a8a03cb3857dfd57d7eea806
2019-12-06 10:25:21 +01:00
Liang Qi
4282752c19 Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: If0f14c514b3c7ce7abf6b27221a26f921fef7f7f
2019-12-05 14:47:57 +01:00
Dimitrios Apostolou
e4f9ac5607 Tag the docker images as "latest"
We will use this tag in qtbase to refer to the image to run, because
with the current sha1tree() tag, every minor change in the docker images
requires synchronized changes between repositories.

Task-number: QTBUG-79867
Change-Id: If94eb6dd8b97526b589e58064837bc6554fed79c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2019-12-05 09:13:39 +01:00
Qt Submodule Update Bot
ec79fbe5ec Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I45dd7a0b0a93a35aa3f528617efeaa2859f9ce6e
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-12-04 08:41:15 +00:00
Alexandru Croitor
8c94279a59 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Id725f04bc4753fc68a9bbb2762beb2c5f4eb9d84
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-12-03 16:48:34 +00:00
Heikki Halmet
7c1c98e123 Provisioning: Install libpoppler
Poppler test requires this package

Task-number: QTQAINFRA-3253
Change-Id: Ifc0904ca020a8606b06a4032d5145fbf2f8063f1
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
2019-12-03 17:51:21 +02:00
Qt Submodule Update Bot
d7a4a50e2d Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Ia5837cb7f71ea98b280b66998f7a3624750dde6e
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-12-03 05:52:31 +00:00
Liang Qi
4b6c05815a Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I4dd840681bd84f7aeed58602b0c998c0e5807e10
2019-12-02 10:27:23 +01:00
Qt Submodule Update Bot
b3da333101 Update submodules on '5.14' in qt/qt5
Change-Id: I7a09d7b24e5feb97ec891f0a92d35b12dcebde91
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-12-01 22:30:59 +01:00
Qt Submodule Update Bot
096fd23eb8 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I0a261abad505b2f2724f0a15a10708b67129ffbf
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-29 17:43:05 +00:00
Liang Qi
bdaf92aa41 Correct branches for .gitmodules
This amends eabc1ed5bd.

Change-Id: Ifbcf5dc593d25d210b652b72e5563fb8e1a1ec5f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-29 15:55:39 +00:00
Liang Qi
61ffa2778f Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Id0fb114e7d4e4bc66d8a51e91ebc8de166229fb6
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-29 15:44:24 +00:00
Liang Qi
95c7b90309 Update CMake to version 3.16.0-rc4
Change-Id: I4fc1f412888e1915ae2110320c18fb39a9600b94
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-29 10:00:50 +00:00
Liang Qi
63c515a6cb Merge remote-tracking branch 'origin/dev' into wip/cmake
Also update the Windows config to use MSVC2019 instead of 2017
to circumvent the issue that vcpkg is building libraries with the
latest compiler it finds (MSVC 2019), but Qt is building with 2017.

 Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtsaferenderer.yaml

Change-Id: I88deb114e171046b50fc617ab6bc18b707d61486
2019-11-28 19:44:30 +01:00
Qt Submodule Update Bot
56ad797f42 Update submodules on '5.14' in qt/qt5
Change-Id: Iaeaf6014ff94eef81ebba7db5ae3de5fa1c4cc2f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-11-27 06:34:45 +01:00
Liang Qi
0d6ae070f4 Update submodules on 'dev' in qt/qt5
Only qtwebengine and qtmultimedia this round.

Change-Id: If5f67c96d26d7721fdb350bb27fbea82aced8e14
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-27 06:10:06 +01:00
Liang Qi
f064a5b9d2 Update submodules on '5.14' in qt/qt5
Change-Id: I75cd18c8c09c47c2eee8dd0629d1cccb3b5838e0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-26 19:25:29 +01:00
Leander Beernaert
3ba8bdeda0 Update qt5.git
Change-Id: Ie922b8e2989215de4efd3596e6532b201a3e7d0c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-11-25 16:40:40 +00:00
Simo Fält
9cf8af5248 Provisioning: Remove sudo when installing pip packages for Qt user
There is no need to install as sudo for qt user. Using sudo will
change the cache dir's permissions preventing us from
installing anything with pip as normal user.

Change-Id: Id45bf3805ce4d772a6c82e429d4e1948289f076e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2019-11-25 13:15:51 +00:00
Liang Qi
86b9edca68 Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtconnectivity.yaml

Change-Id: I1f6b8dff622c3899b2d655108f638404b3bc2189
2019-11-22 17:26:28 +01:00
Liang Qi
b5c9819be2 Update submodules on '5.15' in qt/qt5
Only qtmultimedia this round.

Change-Id: I00a94d159457f50a70a9b9eddedd3efd56870e51
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-21 18:42:57 +01:00
Johanna Äijälä
08ded9e2f8 Provisioning: update Squish
Update with custom build of Squish to be able to launch Qt5.14
applications in RTA tests.

Change-Id: Ic420656852ae885b057de937baabf01135526764
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-11-21 11:26:11 +03:00
Liang Qi
f9183e71bf Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I03ba6455b8789eefb87a844d5fdbe0998cb02337
2019-11-20 07:29:43 +01:00
Heikki Halmet
dcfef7226f Provisioning: Change JDK script to use 'Remove' function from helpers
Task-number: QTQAINFRA-3369
Change-Id: I2e873eb50d9129c48d92370af80fe121039d172e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-20 08:08:10 +02:00
Heikki Halmet
0335e9c4e5 Provisioning: Remove shell scripts under windows
Change-Id: I3d7a949e95bab39adc349c25d267b7fc28e676cf
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-20 09:08:04 +03:00
Heikki Halmet
601a9d39b2 Provisioning: Install python modules needed by packaging
Needed by packaging scripts

Task-number: COIN-214
Change-Id: I3ac719800c3afd183996379f6c23fbe3f8bcf7cb
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2019-11-20 08:07:58 +02:00
Liang Qi
edb5ebfb7e Update submodules on '5.14' in qt/qt5
Change-Id: Ia052f103935e8451e10258315370009b9b24f596
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-20 07:07:48 +01:00
Liang Qi
6d7ae7ebe1 Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
	coin/provisioning/common/linux/docker.sh

Change-Id: Ic5c3fcaa856137de46c6f3830ca75cedb084927d
2019-11-18 19:21:53 +01:00
Heikki Halmet
d8eaed9b09 Provisioning: Update Android NDK version to r20 for macOS 10.14
Task-number: QTQAINFRA-3337
Change-Id: Ib14e3cc484198bb23bb611262b205144f8a8ac70
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
2019-11-18 14:23:08 +02:00
Qt Submodule Update Bot
a72db33bfc Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Ia7d77b5f456e4e6196cacc179952e104476d968f
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-16 21:42:42 +00:00
Alexandru Croitor
eabc1ed5bd Add a few more ported repos to qt5.git wip/cmake
Change-Id: I9f7215d3df0ba07af337262dd5e43bfc79e0a97a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-15 13:02:52 +00:00
Jani Heikkinen
5d5ef9c32b Enable dSYM files for release builds in macOS
Same flag is used in windows and linux ones and it seems that is needed
to enable dSYM files for release builds

Task-number: QTBUG-3934
Change-Id: I3f60ea68ba0f4d755e411215efa4cec1d0a46d83
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2019-11-15 06:22:55 +02:00