Commit Graph

4063 Commits

Author SHA1 Message Date
Liang Qi
488415a9c5 Update submodules on 'dev' in qt5
Change-Id: I2927de7c1c756d0c2645308e8cdfecce01533bc0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-31 10:14:05 +02:00
Juha Karjalainen
38e416be66 Add webAssembly build for windows and macos
Provision emsdk and its dependecies to windows and macos.

Task-number: QTBUG-63917
Task-number: QTQAINFRA-2835
Done-with: Juha Karjalainen <juha.karjalainen@qt.io>
Change-Id: I24ea9cbc4f7cc95e6952765099d5e46247470011
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-07-31 09:44:53 +03:00
Qt Submodule Update Bot
e6823acbc7 Update submodules on '5.13' in qt5
Change-Id: I78f3250367bf544dd8a5b5f1a0cd91c20655e065
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-30 20:08:39 +02:00
Alexandru Croitor
0b2f4d57e4 Update qt5 wip/qt6
qtbase pointing to dev branch, and other repos pointing to
wip/qt6.

qtwebengine and qtwebview are not built at the moment. The build of
the mentioned repos will be restored after bumping qtbase version
to 6.0.0, and after the subsequent qt/qt5 wip/qt6 integration is
merged.

Change-Id: I9b6b8136b2f58b181ae2d2dadb8a96b9c1103225
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-07-29 15:24:06 +00:00
Frederik Gladhorn
a268fb4689 Adjust submodule branches
Change-Id: I65388af02c1ab3608abf7e18a89966020e213d10
2019-07-29 14:26:43 +02:00
Simon Hausmann
ddbebe9dac Stop building debug-and-release packages for MinGW
The requirement to separate debug and release DLLs on Windows stems from
the Visual Studio C run-time library appearing in two different variants
(debug and release) and not mixing well. It's possible to perform builds
without optimzations and with debug symbols while linking against the
release version of the C run-time, but at the same time the debug
version of the run-time brings other developer visible advantages.

MinGW on the other hand does not have this distinction, does not ship
with separate DLLS and does also not require the VS C runtime library.
Therefore we do not need this separation for MinGW, which means that our
packages can be reduced in size and application developers wishing to
debug their applications do not have to use debug builds of the Qt
libraries or run into Qt internal debug code.

This change is in preparation for turning off debug-and-release in qtbase.
Since coin overrides the Qt defaults, this change needs to be applied first.

Change-Id: I2ed6e2c0ae54cf23f78119d115f8d21906859e35
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2019-07-29 10:39:08 +00:00
Friedemann Kleint
abfbc0668c Disable tests for MSVC2015/Win32/64bit
Frequent crashes of tst_QDir have been again observed recently in the
dev branch with MSVC2015. It should be sufficient to test MSVC2017;
MSVC2015 should only be compile-tested.

Task-number: QTBUG-58654
Change-Id: I0eb5a1294432a24548468c993418bc18671547bb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Dimitrios Apostolou <dimitrios.apostolou@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2019-07-29 09:35:08 +02:00
Qt Submodule Update Bot
f84c90706d Update submodules on '5.12' in qt5
Change-Id: I2a96915081171e92e91e5a595e87cd2e0b991a51
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-28 23:30:53 +02:00
Qt Submodule Update Bot
ac2a57b1c3 Update submodules on '5.13' in qt5
Change-Id: I0f92c902424fc5e58158921235b582ef7a7ddc91
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-28 22:31:07 +02:00
Qt Submodule Update Bot
71e9322862 Update submodules on '5.13' in qt5
Change-Id: If1822246b0553ed5d550c766a8e3700fd7c14068
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-27 22:31:00 +02:00
Konstantin Tokarev
716640a477 Provisioning: update Conan and Conan packages
[*] Update Conan to 1.17.0, adjust to change in command line arguments
[*] Update Conan packages to up-to-date versions, add libjpeg-turbo and
    packages for 64-bit MinGW
[*] Rename 03-conan.ps1 to 11-conan.ps1 so that it is installed after
    Python 3 and MinGW
[*] Add license header to conan.ps1

Change-Id: Ibc451ddc54a7227eb6d3a007a20351e77a46875f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-07-26 19:52:45 +03:00
Konstantin Tokarev
4bf0ba2ba1 Provisioning: Add CompilerException and CompilerThreads settings for Conan
Change-Id: I3a52101056bce4d3d4ac9124dbfd566adf47cf80
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-07-26 19:52:37 +03:00
Konstantin Tokarev
2666f3b216 Provisioning: rename 03-conan.ps1 to conan.ps1 to follow naming convention
Change-Id: If24541709d4675498bc4af296e05ce3c62d5045a
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-07-26 19:52:24 +03:00
Konstantin Tokarev
535dbcfe96 Conan: Suppress output of New-Item
Change-Id: I3d62fffa08d38a383187726e08743512236bb859
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-07-26 19:52:18 +03:00
Qt Submodule Update Bot
caf72a3e61 Update submodules on 'wip/cmake' in qt5
Change-Id: I4314ca80f344975b9cb01dbd7d26a2b66149f8d8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-26 08:41:51 +00:00
Qt Submodule Update Bot
41abae4367 Update submodules on '5.12' in qt5
Change-Id: I0b682ebd4643a85f04cb2192efb97e8c5230759a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-26 09:59:29 +02:00
Konstantin Tokarev
f12c226463 Provisioning: install-msys2.ps1 must run its commands synchronously
[*] Using bash instead of msys2_shell.cmd allows Start-Process to actually
    wait for the end of command execution.
[*] cpan requires "yes" to be typed by user when it's run first time,
    otherwise it hangs indefinitely waiting for input.
[*] Stop gpg-agent and dirmngr started in the background to prevent
    CI session from hanging.

Change-Id: I4d4c1f36d215cb7578d1e7059217e34375de96c6
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-07-26 07:50:43 +03:00
Konstantin Tokarev
22c427b369 Use msiexec to install Strawberry Perl from msi package
Currently provisioning fails with following error:  "This command cannot
be run due to the error: %1 is not a valid Win32 application."

Change-Id: I59290d394f231c37af10f27d07dbb9f5d2d2470a
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-07-26 07:50:41 +03:00
Konstantin Tokarev
645bd71404 Provisioning: Run-Executable should print stdout and stderr to log
Task-number: QTQAINFRA-3085
Change-Id: I5343753f75157a2a894bb3ac50d416ab044d86fb
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-07-26 07:50:38 +03:00
Konstantin Tokarev
cb8d38fd9c Provisioning: don't re-run Conan 5 times if there is no error
Change-Id: Ia348ebbc4fc3a2503cc426c011e68b7a410c4a08
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-07-26 07:50:35 +03:00
Qt Submodule Update Bot
f470b8eabe Update submodules on '5.13' in qt5
Change-Id: I0ba5aab5d93df54742604eca6a893cea11cf19c0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-25 22:31:11 +02:00
Qt Submodule Update Bot
c31548830f Update submodules on '5.13' in qt5
Change-Id: Ia71bd5cb97367e0a750e090bfbcacfc89ef41490
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-25 13:45:26 +02:00
Qt Submodule Update Bot
dd7a80d757 Update submodules on '5.12' in qt5
Change-Id: Ife94a7c6264fbb4525ba2cd0370bdf1ba454b7c6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-25 10:15:39 +02:00
Qt Submodule Update Bot
7001f15765 Update submodules on '5.13' in qt5
Change-Id: Ib6e8c649e6e2f6a9c1fd60a459687426aec1a149
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-23 11:11:30 +02:00
Qt Submodule Update Bot
2237ea6d0c Update submodules on '5.12' in qt5
Change-Id: I09887cc4b1e103b9341f096c4c9164f4a96bd431
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-23 09:59:39 +02:00
Liang Qi
5a16472559 Update submodules on '5.13' in qt5
Change-Id: I5a1af05df086b2ba86dc736714a2eae9db299248
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-23 09:43:03 +02:00
Qt Submodule Update Bot
483aff91d5 Update submodules on 'wip/cmake' in qt5
Change-Id: I3026b396baf1de58d44335c72d94fa42ef11e2ae
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-22 10:38:00 +00:00
Qt Submodule Update Bot
cfe2c097e9 Update submodules on '5.12' in qt5
Change-Id: Ib0b559d638d7ae6df4129b97f433b168af757443
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-14 23:30:51 +02:00
Michael Brüning
57ea35cace Un-ignore qtwebengine in dev
Change-Id: I72da39c8bfba31fc366b2757f759a4aba070e960
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2019-07-12 21:48:32 +02:00
Qt Submodule Update Bot
e8c8c94278 Update submodules on '5.12' in qt5
Change-Id: Ieb1b3ec8ae527fe13bd1980045f721511ef579a7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-07 23:30:56 +02:00
Alexandru Croitor
9f1feaf3a0 Merge remote-tracking branch 'origin/dev' into wip/qt6
Fixes the qtdeclarative quoting around DISTRO_OPTS.
Brings in qtquicktimeline submodule.

Change-Id: I7a6a5ae92a196389aff612b7b0dd98a2d31ff4d0
2019-07-07 13:41:22 +02:00
Sona Kurazyan
e4b596fcfe Add the docker images for CoAP test servers
This change includes:
- Docker image for the test server to test non-secure and PSK-based
  CoAP security modes.
- Docker image for the test server to test X.509 certificate-based
  CoAP security mode.

Change-Id: Ice661917591ecaee8ebc3500209bcffc08981f65
Reviewed-by: Ryan Chu <ryan.chu@qt.io>
2019-07-07 11:36:16 +02:00
Alexandru Croitor
84e57b1fb0 Try to update sha1s of submodules to get a working qt5 wip/qt6 branch
qtbase, qtremoteobjects, qtquickcontrols, qtquickcontrols2
qtlocation and qttools are updated to latest dev HEAD.
qtimageformats, qtnetworkauth, qtsvg, qtdeclarative are updated to
point to latest wip/qt6 HEAD.

Change-Id: I70938d0d258208670c7d3e3f73fe3e3b274c2eb2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-07-06 20:33:23 +00:00
Qt Submodule Update Bot
b769633c2e Update submodules on '5.12' in qt5
Change-Id: I4c21b50f87410c4c253f510604e3ec80d6b6f929
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-06 17:46:42 +02:00
Liang Qi
bd7b28582f Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13" 2019-07-06 06:02:12 +02:00
Liang Qi
a319bc5f5f Merge remote-tracking branch 'origin/5.13.0' into 5.13
Change-Id: I97c42bef6632a4aeccefab008e0f615f7a9e9f78
2019-07-05 20:05:17 +02:00
Qt Submodule Update Bot
231a5b777c Update submodules on '5.13' in qt5
Change-Id: I39a42574427b32d1d5c73ea96713913674ca7303
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-05 19:27:39 +02:00
Ryan Chu
d49ae7020c Revert "Revert "Provisioning: disable docker test servers on Windows 10 (x86_64)""
This reverts commit 84ff024609.

Reason for revert: <Some VM crashed again when running docker tests>

Change-Id: Iad753c1c4728c6eddc53816e2c51947ce724bf6b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2019-07-05 08:43:14 +00:00
Qt Submodule Update Bot
bf78588505 Update submodules on '5.12' in qt5
Change-Id: Ief716d10e9e1efcb655f96cc297a3a22ff67839b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-05 09:45:54 +02:00
Qt Submodule Update Bot
3d257d4469 Update submodules on 'wip/cmake' in qt5
Change-Id: I30e47f20800449cf0e808dc467f88c56a106a7ee
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-04 11:57:35 +00:00
Qt Submodule Update Bot
e41646897c Update submodules on '5.12' in qt5
Change-Id: I039e035c56bd14a86eb1b309d0372c90b5d737cf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-04 06:04:31 +02:00
Qt Submodule Update Bot
ff74cdbe96 Update submodules on 'dev' in qt5
Change-Id: I2bbb20be92c15de518f3c361cffbe2a2f0150c4c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-04 06:02:29 +02:00
Qt Submodule Update Bot
c6669046b4 Update submodules on 'dev' in qt5
Change-Id: Ib8778d70ad087c95d92998ae533c6e3fb2412d6a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-03 08:58:28 +02:00
Liang Qi
59891119e7 Update submodules on '5.13' in qt5
Skip qtbase in this round.

Change-Id: I49b70268be1be3d29fca34af87d376dc51154aec
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-02 23:02:59 +02:00
Qt Submodule Update Bot
084bc8e03d Update submodules on 'wip/cmake' in qt5
Change-Id: I982d2416a488f18dc672089e9618db04422cf49f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-02 20:59:38 +00:00
Jędrzej Nowacki
caacdfc3e1 Remove "-DBUILD_TESTING=OFF" from default configs
It is not needed. QtBase build instructions add it explicitly, as
the tests are build with a separate cmake call (to compile tests
against differently installed Qt).

Change-Id: I22fe26d4bdb9dd237df76246607d823f4b4fa315
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-02 13:47:59 +00:00
Jędrzej Nowacki
8e54519b75 Do not specify compiler binary name directly
We have a code that handles that implicitly so it is not needed anymore.

Change-Id: I4aea2f55f9efd24ec7cf22cb8b413789ec3e7fea
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-02 13:47:52 +00:00
Toni Saario
107fb06016 Fix extra file and missing library in platform configurations
Missing libraries in no-gui platform.
Default.txt was supposed to be removed by
    439a1eb220

Change-Id: I91c7802634f69f9e5475921b3610185b386b1b1f
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-07-02 06:47:59 +00:00
Toni Saario
439a1eb220 Change configuration files into yaml format
Change-Id: I252908e9eae3a254f32a286608734b5728cd60b8
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-07-01 10:28:29 +02:00
Qt Submodule Update Bot
3ce3dae19b Update submodules on 'dev' in qt5
Change-Id: If2c839bcc7d8fd40f832854d0e729bd811187d85
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-01 09:17:20 +02:00