lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,686 Commits 118 Branches 270 Tags
a3f91a362cd0e0e1fb0ff78d978dfd16fc1712d9
Commit Graph

4686 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jani Heikkinen
a3f91a362c Adjust submodule branches 
Change-Id: I1c9976b864b980a607564225ec64f9d0311aa32e
 2021-06-18 07:55:38 +03:00
Toni Saario
51e88c7313 Archive global and config from qtbase in doc build 
Copy the global and config folder from under qtbase to directory from
which the documentation.tar.gz is created. This is similar to how these
are added in qmake builds.

Task-number: QTBUG-94443
Change-Id: I1dfd6dd05057bb1bfdaeec9cf5d03fbfe474a5d1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 7ed6d04410)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-06-16 22:22:31 +00:00
Qt Submodule Update Bot
a22e9d7674 Update submodules on '6.1' in qt/qt5 
Change-Id: I52f9c62ba46d5ac4a1808906f0a698b8e1129ce1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-06-16 10:07:33 +03:00
Qt Submodule Update Bot
c0070e50f6 Update submodules on '6.1' in qt/qt5 
Change-Id: I3603941fb853f5073463731cfa48ed2b243ee137
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-06-16 05:38:57 +03:00
Qt Submodule Update Bot
d586120528 Update submodules on '6.1' in qt/qt5 
Change-Id: I2acc33d7bd602f4d1fa8332100dc9927efe295fe
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-06-16 01:47:06 +03:00
Qt Submodule Update Bot
017fe58774 Update submodules on '6.1' in qt/qt5 
Change-Id: I0863abdc1f98725512f0b8e55c0f6527198a03bb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-06-15 20:52:07 +03:00
Qt Submodule Update Bot
402dc4ee8b Update submodules on '6.1' in qt/qt5 
Change-Id: I62578e0fb857e7a338517b75aebfea4de69a1cbe
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-06-15 15:53:36 +03:00
Simo Fält
82c42de834 Add 'Packaging' feature for Mac TestOnly CI configs 
This will allow exporting the testlogs for release.

Task-number: QTBUG-94111
Change-Id: Ib0db2b8ba0814539f235ddff412653e797b3f3e2
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 9673311626)
 2021-06-10 13:23:25 +03:00
Tony Sarajärvi
dc7c53aa05 Replace openSUSE 15.2 with 15.3 
Task-number: QTQAINFRA-4477
Change-Id: Ie8ce60c4e6d9b948be2ff813b599a2d8f6d75099
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit d9be0951b4)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2021-06-08 08:39:21 +03:00
Assam Boudjelthia
b842483f93 Update build tools and platforms API level to 29 
Windows and macOS hosts were still using 28 while Linux uses 29.

Change-Id: I36afd17277605b6478bf840340c0341a7f327caa
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 53220710f5)
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
 2021-06-02 11:18:57 +03:00
Heikki Halmet
0afdcac0c4 Provisioning: Upgrade OpenSSL version to 1.1.1k 
Change-Id: I539d6da1953a40190fbfc8ff80f8e8332d797b1f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 0e9f489192)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-05-31 06:10:29 +00:00
Qt Submodule Update Bot
3661bb8fde Update submodules on '6.1' in qt/qt5 
Change-Id: I8de74a92b3679d9e4ca6d645227c7eb071f6fb87
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-31 07:09:47 +03:00
Eike Ziller
398ce69dab COIN: Remove unused parameters from qt-creator.yml 
We are not using them for the Qt Creator build, since for us it makes
more sense to define these things in the Qt Creator branches. They
create additional noise (and confusion) in the COIN interface though, so
remove them.

Change-Id: Iadcb9570f88fa0245996d8e7c112dc8b54dfe80d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
(cherry picked from commit 3b2dd1560c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-05-28 09:08:13 +00:00
Qt Submodule Update Bot
93f5f2028b Update submodules on '6.1' in qt/qt5 
Change-Id: I1a7b35553ac88e3b3235a35e51debbd36f8e5b79
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-28 11:20:31 +03:00
Qt Submodule Update Bot
ac2f1b1dbb Update submodules on '6.1' in qt/qt5 
Change-Id: Idf5d450bb4fa034c07a0035f050b6619765de74c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-28 04:54:25 +03:00
Qt Submodule Update Bot
cfa82b923a Update submodules on '6.1' in qt/qt5 
Change-Id: I6ee55616fe92516197172de136108257a95581e3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-27 19:33:03 +03:00
Heikki Halmet
9f7c915329 Remove InsignificantTests flag from Windows developer build 
Let's remove this flag from dev branch with separate patch
when fixes are landed

Pick-to: 6.0
Task-number: QTQAINFRA-4427
Change-Id: I0ee7c6df6e0bc7cf9facda005e11644cd9174e41
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2021-05-27 15:37:50 +03:00
Qt Submodule Update Bot
a0b0bae147 Update submodules on '6.1' in qt/qt5 
Change-Id: I76abbd02844aff206b230d0a29fa4b71b1ab3d8a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-27 09:18:22 +03:00
Qt Submodule Update Bot
999392b2d9 Update submodules on '6.1' in qt/qt5 
Change-Id: I98385c5640088fdf2b2d4316db72bdae7417dbf5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-25 10:50:54 +03:00
Qt Submodule Update Bot
035e3b3a65 Update submodules on '6.1' in qt/qt5 
Change-Id: I2f076f1529b5eed5ee1cbf5814b2607c25fccb1f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-25 09:28:34 +03:00
Simo Fält
12ad7f783c Fix used Ubuntu version for Pyside6 license check 
Change-Id: I9f966089818559178d6e1e2c286da25bbd8219e1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit ce66a83485)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-05-24 11:19:40 +00:00
Dan Ackers
5ccd922106 Libusb coin provisioning 
Include libusb to linux, macos and windows

Task-number: QTBUG-90951
Change-Id: I633e731d84cc60064bc2d1942f6a1ce129240711
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 2cee9da977)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-05-24 08:09:33 +00:00
Qt Submodule Update Bot
4d4f38c3eb Update submodules on '6.1' in qt/qt5 
Change-Id: I2886b2354f53b9654e5b2d0475cb74bc3a30eec6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-20 15:36:59 +03:00
Qt Submodule Update Bot
dd6b7cff75 Update submodules on '6.1' in qt/qt5 
Change-Id: Ide6481d4878a6314dadc87162c308057a0a0ccac
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-20 07:33:13 +03:00
Qt Submodule Update Bot
82fd8b507a Update submodules on '6.1' in qt/qt5 
Change-Id: I6ab234020be39f1149315f8a996d19727caf6178
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-19 05:54:06 +03:00
Qt Submodule Update Bot
c3a2f60aa2 Update submodules on '6.1' in qt/qt5 
Change-Id: I8528c0fbb030b11f1643e0a1789437720d9a8819
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-19 00:55:34 +03:00
Qt Submodule Update Bot
c6220711c7 Update submodules on '6.1' in qt/qt5 
Change-Id: I135ce3a06030b03ddf70bc848c5bb0bcb6b13022
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-18 17:07:46 +03:00
Qt Submodule Update Bot
9d935c3f8f Update submodules on '6.1' in qt/qt5 
Change-Id: Id315cdbc1af326fe4659c1d3c168b8c59f033229
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-18 11:12:30 +03:00
Qt Submodule Update Bot
371aaeffce Update submodules on '6.1' in qt/qt5 
Change-Id: I1bec0831d8607d24ffac6cb35c0b6bf07aa5d5bf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-17 11:33:36 +03:00
Heikki Halmet
efd58ecf3c Provisioning: Temporary fix for installing Conan packages in Windows 
Task-number: QTQAINFRA-4443
Change-Id: Iba4b240edaf4a3ec8732ddbe1ae4ac5c1166b676
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 99a81d0c6c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-05-17 04:48:20 +00:00
Qt Submodule Update Bot
032d5386b7 Update submodules on '6.1' in qt/qt5 
Change-Id: Ic1bbf9be97d538cf9d88fc34d1b88142713de7f4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-13 22:17:52 +03:00
Qt Submodule Update Bot
d7137a10e6 Update submodules on '6.1' in qt/qt5 
Change-Id: Ib7307071e10f37b3cf094033b2ea95fc3999dc01
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-13 09:38:59 +03:00
Qt Submodule Update Bot
cb760724a0 Update submodules on '6.1' in qt/qt5 
Change-Id: I3365c9d55dc718bbbd7871e37ee649985b7fb470
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-13 02:18:22 +03:00
Qt Submodule Update Bot
72305c6c0a Update submodules on '6.1' in qt/qt5 
Change-Id: Iaac20c6249e4a00b502e5c5425fe0511168d1989
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-12 05:30:46 +03:00
Qt Submodule Update Bot
9eca61b3fe Update submodules on '6.1' in qt/qt5 
Change-Id: I6de91b63d2214470ca45c6a1fce0fc7cbd8af927
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-12 01:02:46 +03:00
Qt Submodule Update Bot
913ac896f4 Update submodules on '6.1' in qt/qt5 
Change-Id: If60312b5c4fb6182631f3d8664cbaefc3fd74085
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-11 20:16:11 +03:00
Qt Submodule Update Bot
985e702164 Update submodules on '6.1' in qt/qt5 
Change-Id: I9b70d0a06887f24b3d42d8662fdb2bcddfda731a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-11 15:04:30 +03:00
Qt Submodule Update Bot
30423ffe9b Update submodules on '6.1' in qt/qt5 
Change-Id: I033c9435eece1c072d02d96baeb6e29695f66f19
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-11 10:50:40 +03:00
Qt Submodule Update Bot
75dee4f5fa Update submodules on '6.1' in qt/qt5 
Change-Id: Ide93708ae5d95f77df85a130b5de546b2d46c1fe
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-07 07:09:48 +03:00
Qt Submodule Update Bot
36ea89b7e3 Update submodules on '6.1' in qt/qt5 
Change-Id: I974aa7d1bd44204056b11695fe01ec92cfd67932
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-06 20:26:36 +03:00
Qt Submodule Update Bot
a89329f6ad Update submodules on '6.1' in qt/qt5 
Change-Id: Ie75121f5d762ba51e0fead50f20d0f80b2a7e9fb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-06 14:22:06 +03:00
Dan Ackers
f4d76ee88b Add static platform targets for qdb 
Task-number: QTBUG-90951
Change-Id: I9175141d0676526f7139587aeb9c81db15e42f5b
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
 2021-05-06 12:26:32 +03:00
Qt Submodule Update Bot
b562b6b377 Update submodules on '6.1' in qt/qt5 
Change-Id: Ief0000cd5ceba68dab83d3aac15ebb0e51de6891
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-06 09:38:30 +03:00
Alexandru Croitor
7729149c97 Build minimal subset of tests in desktop static builds 
New cmake_platforms_static_tests.yaml file will be included in repos
that support building and running a minimal subset of tests built
against a static Qt.

Currently it's limited to qtbase.

Added macOS, Linux-SLES and Windows static configs.

Skipped specifying the PostgreSQL lib path for Windows and macOS because
the plugin gets automatically linked into tst_moc, but the test build
phase doesn't actually call find_package for PostgreSQL and the build
system generation fails.

Similary skipped specifying the openssl lib location for macOS,
because the module_includes cmake auto test fails to find the
WrapOpenSSLHeaders package.

Explicitly tag iOS static config with DisableTests. The instructions
already skipped building tests for iOS, but it's better to be explicit
and update the instructions not to do that anymore.

Task-number: QTBUG-87580
Change-Id: I0d38a0ad055c92646609202691aeb8db29689f5a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit bead5e8720)
 2021-05-05 10:48:03 +02:00
Qt Submodule Update Bot
ad5af7931a Update submodules on '6.1' in qt/qt5 
Change-Id: I622cd24eed0b4e0c3728bf2b97ba5e9661d0728c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-05 07:07:02 +03:00
Qt Submodule Update Bot
2d81ba0ebe Update submodules on '6.1' in qt/qt5 
Change-Id: I0e971689370fbe221d58d3e9e575c26e3a627829
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-05 02:15:40 +03:00
Qt Submodule Update Bot
08d88f7581 Update submodules on '6.1' in qt/qt5 
Change-Id: I0ecfb22c28cb5d473b8bad465ef59e7034ab740c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-04 14:14:45 +03:00
Qt Submodule Update Bot
b9c174f4b0 Update submodules on '6.1' in qt/qt5 
Change-Id: Ib678fa9b7971f10d00e5c014d1f435577e2b0079
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-04 06:45:16 +03:00
Heikki Halmet
0cf6dd91b0 Remove InsignificantTests flag from macOS 11 
Change-Id: I3bc970226adaed9d8808da40a65abfacfcec809e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2021-05-03 08:58:18 +03:00
Qt Submodule Update Bot
d16b82370f Update submodules on '6.1' in qt/qt5 
Change-Id: Id3096c7c4815f01050098ea47d3079638f69872d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-01 05:24:40 +03:00