Commit Graph

3803 Commits

Author SHA1 Message Date
Joni Jäntti
3b0fbe7213 Provisioning: Ubuntu 18.04: Add required packages for b2qt
These packages are required for building b2qt module.

Needed also on 5.12 branch as meta-qt5 follows Qt branching
and will take provisionings from here.

Change-Id: Ia6c5ffd95d4f778b23f381a6f1f5473aa11971e3
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit ee9dd0d860)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-08-11 09:37:41 +03:00
Qt Submodule Update Bot
fbec569aea Update submodules on '5.12' in qt5
Change-Id: I363647bd417426f6f3629f42bbd1f6e83570c47e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-08-09 15:37:35 +00:00
Qt Submodule Update Bot
8ede8851f4 Update submodules on '5.13' in qt5
Change-Id: If3fe6bab310eb0e403c040ea465ac8197a7059a2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-09 16:22:39 +02:00
Liang Qi
1f79ae5d86 Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13" 2019-08-09 16:22:09 +02:00
Qt Submodule Update Bot
4230f4ac54 Update submodules on 'dev' in qt5
Change-Id: Ic8e437d68ed59391f9a0c5c73cc57298a109b02f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-09 13:00:53 +02:00
Liang Qi
49c808befb Merge remote-tracking branch 'origin/5.13.1' into 5.13
Conflicts:
	.gitmodules

Change-Id: I9b4e8807941f49ed930372cc3466c97110794849
2019-08-09 09:02:41 +02:00
Qt Submodule Update Bot
9e370453bb Update submodules on '5.13' in qt5
Change-Id: Ibcdd2991705555bda542b60c25dbdb0e3dd572cf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-08 23:13:30 +02:00
Liang Qi
f32c9f755e Include QtWebEngine again
This reverts commit a94696ccd5 partially.

Task-number: QTBUG-77304
Task-number: QTBUG-77305
Change-Id: Iae17b2358d39a1d22271b2eb5c73b272a43adb28
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-08-08 22:51:04 +02:00
Qt Submodule Update Bot
0f89c02328 Update submodules on '5.13.1' in qt5
Change-Id: I73c133a6ae2e6a84cd21f3d4f19803d510d23e04
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-08 22:50:57 +02:00
Liang Qi
9b186a9d36 Merge "Merge remote-tracking branch 'origin/5.12' into 5.13.1" 2019-08-08 22:50:52 +02:00
Liang Qi
03d4a54e34 Merge remote-tracking branch 'origin/5.12' into 5.13.1
Conflicts:
	.gitmodules
	coin/platform_configs/qtbase.yaml

Change-Id: I964ffb430436c62ad675fabc853642800499ade3
2019-08-08 15:31:47 +02:00
Jani Heikkinen
9929aff99e Add QMAKE_LFLAGS_APP+=-s as configure argument in linux desktop build
After adding "-force-debug-info" and "-separate-debug-info" debug information
is going in the binaries accidentally & so on exploding binary size.

Debug symbols are wanted for libraries and adding QMAKE_LFLAGS_APP+=-s as
configure argument will prevent debug information not to go inside binaries.

Task-number: QTBUG-69767
Change-Id: Ieec205402b34870901aeb26d9ca98fa9edb159c6
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-08-08 16:21:20 +03:00
Liang Qi
42bfac5bf8 Include qtvirtualkeyboard again
This partially reverts commit 452e0d94d4.

Task-number: QTBUG-76371
Change-Id: Ic45690899c0fc0a7fd38d1c348481fdec09cccf8
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-08-08 14:19:46 +02:00
Tony Sarajärvi
b88acae7a8 Partially revert 'Do DeveloperBuild for Boot2Qt'
This partially reverts commit 8f073cea69.

Autotests slow down way too much still, so we can't run developers
builds eveywhere.

Task-number: QTBUG-63152
Task-number: QTBUG-77304
Task-number: COIN-326
Change-Id: I04b673c2ebfae6c0f6cbc09242cce2e273c7111c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-08-08 12:19:38 +00:00
Qt Submodule Update Bot
f08bd26eeb Update submodules on '5.12' in qt5
Change-Id: If3c40151c06c593327eee7a2394e7495bc11bb55
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-08 11:45:10 +02:00
Qt Submodule Update Bot
b326a502db Update submodules on '5.13' in qt5
Change-Id: If03f5533dcfb83ac2002f109118b5bfa8a4bad5e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-08 00:45:02 +02:00
Qt Submodule Update Bot
f511a2d74f Update submodules on '5.13.1' in qt5
Change-Id: I6073c33388af514d7eb0f014b13cb6694235f650
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-07 12:14:24 +02:00
Qt Submodule Update Bot
2b738468de Update submodules on '5.13.1' in qt5
Change-Id: Ia6d7873072055e86c1aea5c33694ba376a867fa3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-07 10:35:33 +02:00
Liang Qi
f8439ea42c Merge "Merge remote-tracking branch 'origin/5.13' into 5.13.1" 2019-08-07 10:35:16 +02:00
Liang Qi
13b206662b Merge remote-tracking branch 'origin/5.13' into 5.13.1
Notice - qtvirtualkeyboard and qtwebengine got ignored
temporarily due to issues on QEMU.

 Conflicts:
	.gitmodules

Change-Id: Iefab0fa5172c976ca06b3f33772c4c4bc10763c2
2019-08-06 11:46:15 +02:00
Qt Submodule Update Bot
b41a217f35 Update submodules on 'dev' in qt5
Change-Id: Ic29d83fa0488cc77726adde23f21c68f0d7fecc3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-06 06:15:27 +02:00
Qt Submodule Update Bot
2fb0e4f352 Update submodules on '5.13' in qt5
Change-Id: I9498fe9045d23ec400d9437f375d547f054909b8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-06 06:12:03 +02:00
Qt Submodule Update Bot
2970d3660c Update submodules on '5.13' in qt5
Change-Id: If5c6d3363438d613e5ea96bc84018ef913067296
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-05 11:28:51 +02:00
Liang Qi
1e476b01fd Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" 2019-08-05 11:28:39 +02:00
Qt Submodule Update Bot
cb14d29efe Update submodules on 'dev' in qt5
Change-Id: I72ceb9f1c47f5786a8a061b744e085aadb5e17a2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-04 23:01:00 +02:00
Liang Qi
58977376e1 Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ie49f7e5ff9ca02522c6611922b47870aba2c152e
2019-08-04 11:51:40 +02:00
Tony Sarajärvi
9da27c5808 Add macOS 10.14 to the CI
Task-number: QTQAINFRA-2938
Change-Id: Id25c6c3203a07985c9ef1cc914c4398ac7db615c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-03 23:01:34 +03:00
Liang Qi
689ed30f2a Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" 2019-08-03 00:08:09 +02:00
Liang Qi
a94696ccd5 Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
	.gitmodules
		ignore QtWebEngine on QEMU temporarily.
	coin/platform_configs/default.yaml
		no-gui build was removed temporarily.
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtconnectivity.yaml
	coin/platform_configs/qtsaferenderer.yaml

Task-number: QTQAINFRA-2576
Task-number: QTBUG-77304
Task-number: QTBUG-77305
Done-With: Tony Sarajärvi <tony.sarajarvi@qt.io>
Change-Id: If7cf75791677eace762374b92382a2ce15f17f55
2019-08-03 00:02:43 +02:00
Samuli Piippo
fde090e4b5 Add targets for yocto builds
Add empty linux targets that are used by the yaml file from
meta-boot2qt and meta-qt5

Fixes: COIN-320
Change-Id: I574185345a3c3dec0a033e7faed45091b89d4959
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-08-02 09:19:13 +00:00
Qt Submodule Update Bot
4c609c4db3 Update submodules on 'dev' in qt5
Change-Id: I83e4cfe7c9598e4454b2007c993413d85f7a3785
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-02 09:12:07 +02:00
Qt Submodule Update Bot
4c5d3f2e43 Update submodules on '5.13' in qt5
Change-Id: Ia8f240a565043822fec60ce29b348bb79846919e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-01 22:31:04 +02:00
Qt Submodule Update Bot
1fbba6d1ce Update submodules on 'dev' in qt5
Change-Id: Ifa9d7423aeb8bbc179dd31b38c5b1368c8f54146
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-01 14:52:08 +02:00
Konstantin Tokarev
125c5e6528 Provisioning: update conan_manifests for libxslt packages
Package recipe was improved, as a result packages were rebuilt and
checksums need update.

Change-Id: I33bd30b44cbe48b3550cb42eeb995ef8588fcce7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-08-01 14:24:56 +03:00
Konstantin Tokarev
b521ad483c Update platform_configs for QtWebKit
* Remove redundant MSVC2017 configuration
* Synchronize Mingw73 configuration with qt5.txt

Change-Id: I05557ecbf57206fe56ff113f893c37a65f503bf0
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-08-01 14:24:48 +03:00
Jani Heikkinen
30b0d05343 Remove 'Packaging' feature from WinRT_10 x86
We don't deliver binaries for that target anymore -> do not export that
either

Change-Id: Iccf408adeaed071294e10774a5a0c21ec8bd8014
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2019-08-01 12:31:28 +03:00
Qt Submodule Update Bot
72f1742097 Update submodules on '5.13' in qt5
Change-Id: I6f218e6cc6c7de9a4f87f63814e01079a7ab1b02
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-01 10:48:34 +02:00
Qt Submodule Update Bot
d3fbd2ed1a Update submodules on '5.12' in qt5
Change-Id: Ie88f0f640e5cd5ad3e3bb159e0b2c248fddc4d40
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-31 23:31:05 +02:00
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
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