Compare commits

...

166 Commits
v5.9.9 ... 5.10

Author SHA1 Message Date
Qt Submodule Update Bot
c77d4946b2 Update submodules on '5.10' in qt5
Change-Id: Ie45f18cc0c70cca437cadd8bfaa6e8a4ac0c81b8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-12 08:16:58 +00:00
Qt Submodule Update Bot
5611fe34b0 Update submodules on '5.10' in qt5
Change-Id: Ica319a5d98406174ce94d2e3c3784364ab44c642
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-10 07:47:25 +00:00
Mitch Curtis
e30de965b9 .gitmodules: update recommended modules for qtvirtualkeyboard
The basic example will start using qtquickcontrols2, so recommend that.
Remove qtquickcontrols, as it wasn't used.

Change-Id: Ieaab1480e6a85ecaa24888fa58024d728d863a16
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-02-09 18:36:54 +00:00
Qt Submodule Update Bot
b2b076782f Update submodules on '5.10' in qt5
Change-Id: I06c4afea4e574aa78f37009db512ba25194f6d5d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-09 12:47:17 +00:00
Qt Submodule Update Bot
456a4d6453 Update submodules on '5.10' in qt5
Change-Id: I935d6ad075384973425d48782a105a9e3e7d21a0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-08 09:31:00 +00:00
Liang Qi
6cd75cce72 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I71b7fd09cd8f1c7e64531eec8a645c06a7066325
2018-02-07 13:58:54 +01:00
Qt Submodule Update Bot
9a160d28d5 Update submodules on '5.10' in qt5
Change-Id: I818ad09e1071db0369823caf2cd18da601f3bd05
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-06 01:02:56 +00:00
Liang Qi
4cd14f4625 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I3e4ae2508d632919db77af0f365eb25ace1a69e0
2018-02-03 11:08:26 +01:00
Qt Submodule Update Bot
d10baa6d3a Update submodules on '5.10' in qt5
Change-Id: Iefacfb5735b27e25a7e5eba595245f22a9ae07d1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-02 21:53:38 +00:00
Maurice Kalinowski
f1422dc64b Provisioning: Switch download sources for mqtt paho broker
Internal resources are preferred and should be used first.

Change-Id: Ifd2a54858c9fb6b82c3dc268566c67238aad262e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-02 06:22:53 +00:00
Maurice Kalinowski
e33f38acef Update MQTT provisioning
Setting an environment variable has been centralized to a separate
script.

Change-Id: I027f9a71d32ee7f7d68575c9433f56a40a369deb
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-02 06:22:49 +00:00
Frederik Gladhorn
351a519340 Merge remote-tracking branch 'origin/5.10.1' into 5.10
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Change-Id: I218ce5567da7ea383009dca2c04beb974511dfcc
2018-01-29 13:44:48 +01:00
Frederik Gladhorn
485244b016 Merge remote-tracking branch 'origin/5.9' into 5.10.1
This was pushed directly, bypassing codereview.qt-project.org to get
provisioning back into a working state.

Change-Id: Ia5d2e6f7079162f571cd7c7994c0f2b3133b1163
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-01-29 13:34:28 +01:00
Oswald Buddenhagen
3504be0d83 Adjust submodule branches
Change-Id: If777dfa31ad635b8a2a6cb98d65c0be5f6e39a39
2018-01-26 16:00:53 +01:00
Liang Qi
3c3d56c0cc Update submodules on '5.10' in qt5
Change-Id: I7823fe54729d3b385e11b1a2f7b6f6cfec6ebe55
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-26 07:54:42 +00:00
Qt Submodule Update Bot
352b30a15d Update submodules on '5.10' in qt5
Change-Id: I92a54351148ee369eaacca6064c12b73f18be4da
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-24 08:55:01 +00:00
Qt Submodule Update Bot
e32dd4fe58 Update submodules on '5.10' in qt5
Change-Id: Id21e7a1007ee9ea956431fe84890337074271f7d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-23 07:58:13 +00:00
Qt Submodule Update Bot
b6a1e9f07e Update submodules on '5.10' in qt5
Change-Id: I9405e2dc8a6a93cbf5d7f86d8dbfd9a96c8b41b1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-21 07:36:34 +00:00
Qt Submodule Update Bot
5f57762934 Update submodules on '5.10' in qt5
Change-Id: I0a49d2eb0c8a7b7a16aa32ba24924299f6d40270
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-20 14:19:44 +00:00
Liang Qi
45528e6874 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I0fdced87d2064e8459fa0b9c4e16a53c1f44ac0a
2018-01-19 09:56:46 +01:00
Qt Submodule Update Bot
21e7344389 Update submodules on '5.10' in qt5
Change-Id: I7b7796d1651b5b1384f543b9e64c0c836113689c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-19 05:24:06 +00:00
Qt Submodule Update Bot
b22fccf5ba Update submodules on '5.10' in qt5
Change-Id: Ibbbd5202c450921ba47c33e28034fce631e82546
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-18 05:14:41 +00:00
Qt Submodule Update Bot
b55370e356 Update submodules on '5.10' in qt5
Change-Id: I986f33a9a04f1172c5fbfe37a45f984837a2a684
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-17 13:14:49 +00:00
Qt Submodule Update Bot
5ee73db243 Update submodules on '5.10' in qt5
Change-Id: I43c91914547bb1b27f29ce948707eaf4b8373825
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-16 08:01:20 +00:00
Liang Qi
4175522924 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Idf9c18da5527327178887c257fc56dbc27e1c8ad
2018-01-12 12:06:07 +01:00
Liang Qi
19872ea843 Merge remote-tracking branch 'origin/5.9' into 5.10
Fixed up provisioning script locations after the reshuffeling into
common/platform folders.

Change-Id: Ia0b7d076e475ccc207f2955572fb9ab4171e5d9d
2018-01-11 15:13:13 +01:00
Qt Submodule Update Bot
271fedaf88 Update submodules on '5.10' in qt5
Change-Id: If56253b74477a0bdc034f1daf32920d3363a27f4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-11 06:42:49 +00:00
Qt Submodule Update Bot
a8e3c392b2 Update submodules on '5.10' in qt5
Change-Id: I8c259b106a628a317c81a59c042e79c3f145a402
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-09 10:57:05 +00:00
Tony Sarajärvi
2fe8d370e6 Add +x rights to provisioning scrips missing it and consolidate shebang
Change-Id: I1e1fb37bfffd0451c02166227805b40b48d31582
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-07 15:20:39 +00:00
Tony Sarajärvi
22e4664eb0 Fix opcua provisioning by sourcing .profile
When CMake is installed it exports its install
path into .profile. However, freeopcua doesn't source
it as builds do, so it couldn't find the cmake.
Also, as Ubuntu is using .profile in our builds,
this commit fixes so that the PATH is actually written
into the right file.

Task-number: QTBUG-65594
Change-Id: I561a88a07872436bb4a3bd62a2d55fd56a130121
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-07 15:20:37 +00:00
Tony Sarajärvi
84899eca4c Consolidate prefixes of provisioning scripts
Change-Id: I75a4bcb049a2c4d034a74b6838ffe7ddf2c3015e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-01-07 15:20:34 +00:00
Qt Submodule Update Bot
7139f29749 Update submodules on '5.10' in qt5
Change-Id: I8d3a6f72435d9bd1cf23146656b5bcef958e993d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-07 15:20:31 +00:00
Liang Qi
2a39f8e5fe Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I7119e6e1853b0eef2b695fb8165518e90b18d250
2018-01-06 09:08:20 +01:00
Jake Petroules
d3c2de907d Add Apple tvOS and Apple watchOS configs for all modules
...not just qt5. This will eliminate the semi-frequent integration
failures in qt5 submodules updates.

Change-Id: I99a4eb1cf41005adcfd12e385b663a5d8adbc628
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-05 04:15:19 +00:00
Liang Qi
1bba397539 Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh

Change-Id: I5aaf8fa93f7a9f06e30b9730703e8d1e018cb1f7
2017-12-22 21:37:24 +01:00
Qt Submodule Update Bot
a4adb7f7d6 Update submodules on '5.10' in qt5
Change-Id: I84aaff41d77d31eb5c4c9aae973aaccd879ede3e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-12-20 05:38:34 +00:00
Konstantin Tokarev
b3d3adc541 Add libxml2 and libxslt to RHEL 7 for QtWebKit
Change-Id: I5c50ee482aa20f0d9959915c81d2c44cccce6dca
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-12-19 22:10:34 +00:00
Qt Submodule Update Bot
2e75f02a3f Update submodules on '5.10' in qt5
Change-Id: I7d7808d588470cbb2712cbda34a0c1bcc5730d11
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-12-19 12:00:51 +00:00
Konstantin Tokarev
2ee0364139 Add GStreamer libraries to openSUSE for QtWebKit and QtMultimedia
Change-Id: Ia40bb35687bbe1ecb429c042d4acfa22599b69b8
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
2017-12-18 18:18:04 +00:00
Qt Submodule Update Bot
9236cd01a2 Update submodules on '5.10' in qt5
Change-Id: I8514e3e83b62ae4ddc527eb73bcfdcd138ac1875
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-12-16 07:19:34 +00:00
Tony Sarajärvi
ae6ea5349f Remove Windows 8 provisioning scripts
They are replaced by 8.1 scripts.

Change-Id: Ib04c183b75cec2c6e529945f382c53fdeb23f213
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-12-15 11:03:06 +00:00
Konstantin Tokarev
f5dfdedb2d Add libxml2 and libxslt to openSUSE for QtWebKit
Change-Id: Iafb89bf9c12cf1d38c2fe1944d55965319b85ea3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-15 11:03:03 +00:00
Tony Sarajärvi
547a0ded90 Provisioning: Update default compiler to GCC-7 in openSUSE 42.3
Task-number: QTQAINFRA-1258
Change-Id: Ia2683a23ecc55aae4e82f901f446d1cf46895269
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-12-14 17:59:45 +00:00
Tony Sarajärvi
df7255ce44 Swap ICC builds to use system's SQLite library
Task-number: QTBUG-64650
Change-Id: I2c692ae04f0cc02a5fecb12e3a7b905ee89b1af9
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-12-14 17:59:31 +00:00
Qt Submodule Update Bot
3bcc9a9181 Update submodules on '5.10' in qt5
Change-Id: I6c96508c89b6acab297d4f486b3b8966e28e4eee
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-14 17:59:21 +00:00
Liang Qi
475fc2c2ad Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	.gitmodules

Change-Id: If22ccc401db60d550d6e6b474d54a05b363884af
2017-12-13 23:28:56 +01:00
Liang Qi
eccfaf1f50 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Ica3e7340f572140020318c6e22397fad393f9b15
2017-12-11 12:11:51 +01:00
Liang Qi
c2c45640e0 Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	coin/platform_configs/qt5.txt
	coin/provisioning/common/install-commandlinetools.sh
	coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh

Change-Id: I3b20cda2b35412fd708295e4f9e32cd2d7d638fb
2017-12-09 23:09:15 +01:00
Qt Submodule Update Bot
a0e1f4f480 Update submodules on '5.10' in qt5
Change-Id: I428bbebe2b5e86e6ed7150080ab3ced2a6077fb8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-09 13:48:21 +00:00
Liang Qi
1f4d727570 Merge remote-tracking branch 'origin/5.10.0' into 5.10
Change-Id: I8d8c6b21a68caf28913934141f6b1f98be0ff369
2017-12-04 14:17:33 +01:00
Qt Submodule Update Bot
f8712c099d Update submodules on '5.10' in qt5
Change-Id: Ifd29751e627dbefb3f93c5f3ce4ff2cfec5d59fb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-12-03 15:43:51 +00:00
Heikki Halmet
adcdf7b49f Provisioning: Install Devtoolset-4 to Rhel 7.4
Gcc need to be downgraded from 6 to 5, because Gcc 6 is too new for
the latest Ubuntu LTS (16.04). This means Devtoolset-4 need to be used
instead of Devtoolset-6.

Task-number: QTBUG-64820
Change-Id: I2601aaaff5f3bbbadd867105fd4155239ab89825
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
2017-12-01 17:55:19 +00:00
Qt Submodule Update Bot
6e54086be5 Update submodules on '5.10.0' in qt5
Change-Id: I398ac279c6a6065e12c953ae129cfcc98e37388a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-12-01 07:03:38 +00:00
Qt Submodule Update Bot
2b7b098700 Update submodules on '5.10' in qt5
Change-Id: I88c38e77cad31acd45bb0ffea14fbfee48d5ee4c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-11-30 09:35:36 +00:00
Heikki Halmet
f1db104ff9 Provisioning: Install bluez-libs-devel
bluez-libs-devel is needed to enable Qt Bluetooth

Task-number: QTBUG-64782
Change-Id: Ie668a44463307c7089bb96a087acab04c27dd3a0
(cherry picked from commit 9b722f9df91c4f7a6ca24d3ad18e68e3a76b137b)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-29 15:25:35 +00:00
Qt Submodule Update Bot
ed0f440974 Update submodules on '5.10.0' in qt5
Change-Id: I97468b13eeba051ff2c59162dfb3855a2c8e838e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-29 15:25:32 +00:00
Qt Submodule Update Bot
eb3b287df1 Update submodules on '5.10' in qt5
Change-Id: I49d2ac31b572687781d8b1006f64206f57f3890a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-11-27 07:15:37 +00:00
Qt Submodule Update Bot
8baf4c994e Update submodules on '5.10.0' in qt5
Change-Id: I305d3f429ad7cc3650c26640b4da6077afc796af
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-26 02:00:31 +00:00
Heikki Halmet
beb73056c3 Install command line tools for osx 10.11 and macOS 10.12
Command line tools is needed by homebrew when installing p7zip

Task-number: QTBUG-64729
Change-Id: Ia13838e3f5845351cb682c7d25127c8f36172d3b
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-26 02:00:23 +00:00
Liang Qi
bc16944191 Merge remote-tracking branch 'origin/5.9.3' into 5.10.0
Conflicts:
	.gitmodules
	coin/provisioning/qtci-linux-RHEL-7.4-x86_64/mqtt_broker.sh

Change-Id: I3bfaa9531a4b62426ec276c764ffda5cffcbdcaa
2017-11-25 16:40:50 +01:00
Qt Submodule Update Bot
fdfe9e05ba Update submodules on '5.10' in qt5
Change-Id: Ibcd840cc4135dc1860facbe2176555662eabc55a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-25 15:37:24 +00:00
Allan Sandfeld Jensen
9a9d798ce4 Add NSS to RHEL 7.4
Needed by QtWebEngine

Change-Id: Ieed87170eccc288523bc966dab1a25025c37abfa
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-25 13:26:30 +00:00
Qt Submodule Update Bot
f60bc7aa9d Update submodules on '5.10' in qt5
Change-Id: I76ddfac0ffac176a5d63b83bf13c4bacac8babbe
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-11-24 06:46:36 +00:00
Qt Submodule Update Bot
f113a65c6e Update submodules on '5.10' in qt5
Change-Id: Ib454b91cd68ec6c109fe007b6667771a006ee95c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-11-23 17:28:14 +00:00
Qt Submodule Update Bot
5a4b7a56b8 Update submodules on '5.10.0' in qt5
Change-Id: Ia7b0ea9299a26d9e10a859e8d977d24f9cc22dde
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-23 12:46:44 +00:00
Qt Submodule Update Bot
e6ddce15c3 Update submodules on '5.10' in qt5
Change-Id: I12db3b69a01215489142b271976e33050874bf5b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-22 07:52:43 +00:00
Qt Submodule Update Bot
5d6f3486bc Update submodules on '5.10.0' in qt5
Change-Id: I29389744d77591850f3b50ba5bec3b97bd5865b0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-21 09:19:30 +00:00
Qt Submodule Update Bot
208baeb301 Update submodules on '5.10' in qt5
Change-Id: I6c6623f1d66a65e6d3eadeda6acb2bfee9996b6d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-20 20:10:15 +00:00
Liang Qi
47bf73f4d0 Merge remote-tracking branch 'origin/5.10' into 5.10.0
Change-Id: I42aa9ce33260d7ea1cd51ac5ba1bf525f92d1185
2017-11-20 13:54:12 +01:00
Liang Qi
35db040229 Update qtwebengine only
Change-Id: I3f5934b4787c7206391cbfaa305138df447b1d23
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-19 06:55:22 +00:00
Liang Qi
062b29b311 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Iac3073d85bd94d27c296b307a827ee6bd97c4194
2017-11-16 23:14:25 +01:00
Liang Qi
26fda37639 Update submodules on '5.10' in qt5
Change-Id: I92ef03c6036b4391aa9c380c1b55b9ac388a3b07
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-16 08:51:10 +00:00
Liang Qi
90272a84ae Merge remote-tracking branch 'origin/5.9' into 5.10
Also update to pyro toolchain in QEMU way.

 Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt
	coin/platform_configs/qtdeclarative.txt
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh

Done-with: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Task-number: QTBUG-64384
Change-Id: If0451b81059e6831a5e5df0f359f119caf4ee09d
2017-11-09 14:05:56 +01:00
Oswald Buddenhagen
94ce420956 Adjust submodule branches
Change-Id: Ia4636256e7797beffbbdddb21f2f6b4839e1020b
2017-11-07 16:58:57 +01:00
Qt Submodule Update Bot
f1a9b684bf Update submodules on '5.10' in qt5
Change-Id: I88d2003d82ca37105d351d00c255e8f6ab303529
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-07 03:52:53 +00:00
Liang Qi
0aecf8a1df Update qtwebengine only
Change-Id: Ib0480653a5afc9fbf202a5e0108a4536a1ec9f92
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-05 07:24:19 +00:00
Jesus Fernandez
4a4589d878 Don't recommend QtWebView in QtNetworkAuth module
QtWebView is not used in QtNetworkAuth. There is no need to recommend
the QtWebView module.

Change-Id: I2dbb9d4024ada9436725f4dac643574b558fb9ae
Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-11-03 11:08:25 +00:00
Liang Qi
d068364935 Update submodules on '5.10' in qt5
Change-Id: Icf4e56ddd72e135dff539281f1b7d81f45132986
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-03 05:14:29 +00:00
Heikki Halmet
5a7288d9b2 Provisioning: Refresh Subscription-manager
Subscription manager need's to be refreshed so that redhat repositories
will stay available for provisioning scripts

Change-Id: Ie93aef60cbd2bb851673b4e1cd8afb5f23b1395c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-11-02 06:35:20 +00:00
Liang Qi
59cd433253 Update qtwebengine only
Change-Id: I8ab878c59ab56004a7293f85a4014c274dd93b06
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-28 06:15:21 +00:00
Qt Submodule Update Bot
d18655ef5a Update submodules on '5.10' in qt5
Change-Id: I59f1102e56c9882ad9d5c89b026c33bdcf885a51
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-10-27 13:07:10 +00:00
Qt Submodule Update Bot
88a5b96c50 Update submodules on '5.10' in qt5
Change-Id: I50fde887007ad394e276749b1ce354008eeb8aff
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-24 04:59:15 +00:00
Liang Qi
22a2a8a6b9 Update submodules on '5.10' in qt5
Change-Id: I78d5aa1f7b2ecaecf31c4458b2d489633cf7bc17
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-20 13:50:03 +00:00
Liang Qi
c41dd34de7 Update submodules on '5.10' in qt5
Change-Id: I550202469e06a974a942fbc7f207a09236f84a7d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-19 11:39:19 +00:00
Qt Submodule Update Bot
9a096e6841 Update submodules on '5.10' in qt5
Change-Id: I2bf9e16177826276d6b6f5f8aa1a6708d62912a8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-10-05 06:54:38 +00:00
Qt Submodule Update Bot
ae9f6019bc Update submodules on '5.10' in qt5
Change-Id: Ifedd5a9d3cce47323ff432d7237b1156f4469bdf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-10-04 06:36:18 +00:00
Qt Submodule Update Bot
cf0a8af55d Update submodules on '5.10' in qt5
Change-Id: I66c6ad9f0c47757615bf9398ccaa2889d22681fd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-10-02 08:29:12 +00:00
Qt Submodule Update Bot
35a3ba35ef Update submodules on '5.10' in qt5
Change-Id: Ifae0935db8d9862051b605438a4f713dd7e97a34
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-10-01 09:02:32 +00:00
Qt Submodule Update Bot
7983297c8b Update submodules on '5.10' in qt5
Change-Id: I511688940a93b3e86c0d4782cf332788e390933b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-30 09:29:14 +00:00
Qt Submodule Update Bot
e9c5f633e0 Update submodules on '5.10' in qt5
Change-Id: Ic6c5ea39d6233ef0cf95f38b7ed8da5079631aef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-29 07:58:57 +00:00
Qt Submodule Update Bot
1643c95635 Update submodules on '5.10' in qt5
Change-Id: If4c77fbc983d5ee85655efa8ec46785b5ce2584c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-28 19:02:58 +00:00
Liang Qi
1cfc052b9d Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	coin/platform_configs/qt5.txt
	coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh

Change-Id: I16388eb0c2ebaa08e7bb1255711d64647fdad3ac
2017-09-27 10:26:38 +02:00
Qt Submodule Update Bot
36d633f2fd Update submodules on '5.10' in qt5
Change-Id: I1df55eab97f42f44bf68c41bf6e2a0e5f36fe3ae
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-27 06:47:03 +00:00
Qt Submodule Update Bot
214a38f974 Update submodules on '5.10' in qt5
Change-Id: I1d4c2064ee31a8adc1a048782824b3d597ea3242
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-26 09:24:30 +00:00
Liang Qi
892b1977c5 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I623539ff0e95642bdd58fa3bbac4d1c88afbe519
2017-09-25 08:57:06 +02:00
Qt Submodule Update Bot
90ddfaf35f Update submodules on '5.10' in qt5
Change-Id: I5ef48890ad2a3c87c1dd89bc4ee35f132bd0d967
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-25 06:09:56 +00:00
Qt Submodule Update Bot
ce1627df92 Update submodules on '5.10' in qt5
Change-Id: I60fda85bc418ae5d030608184edc242f82d12227
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-23 07:27:16 +00:00
Maurice Kalinowski
b77ab20bf0 Provisioning: Update MQTT provisioning
MQTT_TEST_BROKER_LOCATION needs to be prepended to .bashrc to avoid not
being evaluated. Furthermore, a previous installation might need to be
removed.

Change-Id: I9edaeb13378aa262b453f816260ade01ba414961
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-23 05:48:44 +00:00
Liang Qi
d82fe5cacf Update submodules on '5.10' in qt5
Change-Id: If7ecb5f1d09e34878a553b287771a8eed395bfd1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-22 08:03:30 +00:00
Qt Submodule Update Bot
804bfd8700 Update submodules on '5.10' in qt5
Change-Id: I6fe7831d598a724eb8796e8a8e97a4946f5d6be4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-21 12:25:08 +00:00
Qt Submodule Update Bot
5d5a6d3a87 Update submodules on '5.10' in qt5
Change-Id: Ic0421ee85440e9f08f805c6f475238bf8820da0f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-20 05:45:12 +00:00
Joni Jäntti
0c66e761be provisioning: Windows 10 x64/x86 Vulkan SDK
Added provisioning for LunarG Vulkan SDK on Windows 10 x86/x64.

Task-number: QTQAINFRA-1186
Change-Id: Ie6a4d3a9d8b605e4f1301a3045f8165d349f216f
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
2017-09-19 06:39:31 +00:00
Simon Hausmann
99af319684 Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10 2017-09-19 06:39:29 +00:00
Qt Submodule Update Bot
1d965fc599 Update submodules on '5.10' in qt5
Change-Id: Ic5c4e7dde129798e0799d74741c69b32c855351f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-19 04:11:22 +00:00
Simon Hausmann
356b20feed Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh

Change-Id: Icf3d05fa71052b411febe58c287b9a5b014a275f
2017-09-18 13:51:35 +02:00
Qt Submodule Update Bot
c4a807ca85 Update submodules on '5.10' in qt5
Change-Id: I08e75951d175003a670987e1f9ea35296bc12d16
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-18 11:49:50 +00:00
Qt Submodule Update Bot
f02c2e2fde Update submodules on '5.10' in qt5
Change-Id: Ia67db183b40e1bec41677876f7c8c4c4e69f30d9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-17 00:00:57 +00:00
Simon Hausmann
b7d9431716 Fix python installation on OpenSuSE 42.3
The move was forgotten in commit
dd3d32d13c that merged the 42.1 to 42.3
switch from the 5.9 branch.

Change-Id: If76ac7b54187cfb29dafeaccbd3cd56e3e01deab
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-09-16 05:17:48 +00:00
Maurice Kalinowski
fd76acc661 Add mqtt to qtci-linux-openSUSE-42.3-x86_64
MQTT provisioning happened concurrently with an OpenSUSE update.

Change-Id: I23a8b632ff82e3900931b58d3d06b9f37bda5998
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-14 15:04:30 +00:00
Qt Submodule Update Bot
3e9b7b16c9 Update submodules on '5.10' in qt5
Change-Id: I155cd4eccb5b298f93fe36437b9db450d6e23a6d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-13 04:16:14 +00:00
Jani Heikkinen
2ef18dac6c Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10 2017-09-10 11:16:26 +00:00
Maurice Kalinowski
a1f173fc67 Provisioning: Install paho mqtt broker
The paho broker is used for testing the Qt Mqtt module, specifically the
client classes.

Change-Id: I252a337eb0454e871669a467dba2d9a379fb33d5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-09-10 11:16:15 +00:00
Qt Submodule Update Bot
eb89f13583 Update submodules on '5.10' in qt5
Change-Id: Ic0236346284e3b30012977f634f52d8aa3851d24
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-10 00:01:18 +00:00
Simon Hausmann
dd3d32d13c Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qtdeclarative.txt
	coin/provisioning/common/InstallPKGFromURL.sh
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh

Change-Id: Id174b48e650ed18fbba48b4fc617ee075b0586ec
2017-09-06 10:19:35 +02:00
Tony Sarajärvi
cc8a7501f3 Swap B2Qt branch to Pyro
Task-number: QTQAINFRA-1364
Change-Id: I55906a90e26dccd8d32e686368530f27e46e67fc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
2017-09-05 15:15:59 +00:00
Qt Submodule Update Bot
87df3502a7 Update submodules on '5.10' in qt5
Change-Id: Ic754baf143f879f561c4d28c8eae3c8675ef9412
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-09-01 19:44:43 +00:00
J-P Nurmi
eb6ce241f0 qtquickcontrols2: recommend qtimageformats
The new image-based style in Qt Quick Controls 2 uses WebP for
animations.

Change-Id: I42360fc29fbfdc1d85cab5ef37b57569e5af6901
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-08-31 14:29:01 +00:00
Qt Submodule Update Bot
bf09762570 Update submodules on '5.10' in qt5
Change-Id: I10ce89cd030062845d72a49266bb077cabd935ea
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-08-30 04:21:28 +00:00
Oswald Buddenhagen
738509c242 Adjust submodule branches
Change-Id: I24415b4ce9d74e9eb83420a55e9036d1b0785a73
2017-08-25 14:59:40 +02:00
Liang Qi
e6da4a6aa5 Update submodules on 'dev' in qt5
Change-Id: I7192cbb513f05320c792a29a598b535bcd469d85
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-25 11:55:17 +00:00
Liang Qi
ebf8aa15e6 Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
	.gitmodules
	coin/platform_configs/qt5.txt
	coin/provisioning/common/system_updates.sh
	coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
	coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh
	coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh
	coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh

Change-Id: Id9c38f3cda85b82fc20fb4a1f2ec71aa18646d94
2017-08-24 09:12:33 +02:00
Qt Submodule Update Bot
d18d7aaa40 Update submodules on 'dev' in qt5
Change-Id: Ic68d5b4cc41971eb619f2ba32097612aa20df3b1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-29 05:44:26 +00:00
Simon Hausmann
b229f6d1ea Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I2d5232e2c3a7a8e0d90183b0448ba0ddb5351a29
2017-07-26 15:34:03 +02:00
Maurice Kalinowski
42a802efba Update freeopcua version
And also moved to Ubuntu 16.04 as we're not testing 14 anymore.

Change-Id: I3fd12a1ff290e564f15a557da33ce3c0008b4f81
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-26 07:45:00 +00:00
Liang Qi
65eb6e74f8 Update qtwebengine and qt3d only
Task-number: QTBUG-61693
Task-number: QTBUG-61983
Change-Id: I703ea440ae1b572ae97c4c6616f63b5524718931
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-18 04:16:45 +00:00
Simon Hausmann
d615b4a99f Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
	.gitmodules
	coin/platform_configs/qt5.txt
		Remove QNX Windows builds, 0358b6d2
		Remove Integrity build temporarily, QTBUG-61702
	coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh

Done-with: Liang Qi <liang.qi@qt.io>
Change-Id: I5a56633d6cd60b5514828060fde87f784e54cdda
2017-07-14 07:24:32 +00:00
Liang Qi
bded0e1bbc Update qtqa only
Change-Id: I326c5a081af3bdd5e11aff5316c604a64db94a97
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-07-07 22:02:45 +00:00
Liang Qi
cdbccd5a12 Update submodules on 'dev' in qt5
Change-Id: I3aca18dc902cd9499c5977e606cd256082144695
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-07-07 21:33:24 +00:00
Liang Qi
82bdc55bc3 Update submodules on 'dev' in qt5
Change-Id: I0c3b28b0ecfefca4211f4944a059e383173415d8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-07-06 06:17:22 +00:00
Liang Qi
cc549c2444 Update qtqa only
Change-Id: I6ef90bb4ce03188a3bcc6e22bbf1e9204e763690
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-07-04 11:51:53 +00:00
Liang Qi
744634e97f Update qtwebkit only
Change-Id: I767b48af8cf41355cc984f8d884b1bc042cae4bf
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-07-03 18:04:50 +00:00
Jani Heikkinen
f3a2e06e60 Switch qtspeech & qtnetworkauth from tp to addon
qtspeech and qtnetworkauth aren't technology preview modules anymore
from Qt 5.10 ->

Task-number: QTBUG-61436
Change-Id: I1a88f554498461a81ee80f435fccad7d0e542abf
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-06-29 21:16:52 +00:00
Liang Qi
69188e280c Update submodules on 'dev' in qt5
Change-Id: I40a221e14a1d308619e1e382b08ae16240b81ead
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-29 21:16:49 +00:00
Jesus Fernandez
e6d42ad390 Add qtwebglplugin
Task-number: QTBUG-61443
Change-Id: I0a139c68c41cfa11d110fab1d7c97276c4d022a0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-06-28 15:34:08 +00:00
Liang Qi
b99923d6ee Update qtdeclarative only
Change-Id: Id092226dfa273fff8459b6a256ce5e5e87c364ed
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-26 22:27:57 +00:00
Dominik Holland
1859f9b26c Download and install vc_redist 2015 on windows 7 and 8
This is a dependency of the python3 packages for windows

Change-Id: I6f45dcb1d64f43dedd883d33fdc85038c24fc501
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-26 08:12:40 +00:00
Dominik Holland
a765838889 Fix the python3 packages on openSUSE 42.1
Change-Id: Ie445949ac90bf6a9ce7b519bbe3c32d2d1e1a69b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-13 16:39:12 +00:00
Oliver Wolff
0787472145 Add winrtrunner to common tools on Windows 10 machines
winrtrunner is needed for running auto tests on winrt. As the tool
resides in qttools and not qtbase and it not changed often, it was
decided to handle it similar to jom and see it as an external tool.

Change-Id: I9636962df51f98bef6aad3e340c565f50e393949
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-12 05:43:15 +00:00
Qt Submodule Update Bot
026f813fcb Update submodules on 'dev' in qt5
Change-Id: I23fe8d00027c73dd5ea774589853a4e22c70e402
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-12 05:43:12 +00:00
Qt Submodule Update Bot
9101ac782f Update submodules on 'dev' in qt5
Change-Id: I5f4b2743d35576c0b6df2ee62ec404d337974c3c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-07 05:06:50 +00:00
Qt Submodule Update Bot
38ae7edf69 Update submodules on 'dev' in qt5
Change-Id: Ib7ce19810c0daa4c0cf39198c580dc6baa22c74a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-04 08:52:58 +00:00
Qt Submodule Update Bot
eeb1a20326 Update submodules on 'dev' in qt5
Change-Id: I3a885b5f914584fa259fbd94553e8f03fb160573
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-05-30 05:51:44 +00:00
Dominik Holland
a5f3f8ed48 Install python3 on all platforms
Task-number: QTAUTO-345
Change-Id: If11ca425fa08cce8a518710ded0a6ec58159343d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-11 10:29:12 +00:00
Jake Petroules
d48b0c3402 Remove Static from the tvOS configuration
This further helps with the shared library coverage on iOS-like
platforms as iOS and tvOS are nearly identical, until such time iOS can
be moved to shared libraries for official releases as well.

Change-Id: I7dbc448890759a4e49a242d4c5bcb00f6c673f4e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-06 09:18:10 +00:00
Jake Petroules
dfb0befca3 Remove Static from the watchOS configuration
This was unintentionally added, and helps with the shared library
coverage on iOS-like platforms until such time iOS and tvOS can be moved
to shared libraries for official releases as well.

Change-Id: Iabae0503a0ce3fe538b97fc1941a1ccf19024429
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-05 06:12:36 +00:00
Qt Submodule Update Bot
596702c398 Update submodules on 'dev' in qt5
Change-Id: Ia5664a1fa14008265e4df4b4937d6f1de96c30c9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-05-04 05:44:15 +00:00
Qt Submodule Update Bot
76ea20881e Update submodules on 'dev' in qt5
Change-Id: I8b9a5e7630127bc423854ec2d680a51e779b2db3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-05-03 10:10:56 +00:00
Jake Petroules
ddf574fd81 Make Apple tvOS and Apple watchOS configurations available
Change-Id: I53b71d04c8cdf68f136a6ca057282c656307919e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-25 21:14:41 +00:00
Qt Submodule Update Bot
ec5efb6b70 Update submodules on 'dev' in qt5
Change-Id: I662d698fcf213f2f5e936827dffafe0605309a31
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-25 07:14:38 +00:00
Qt Submodule Update Bot
79bc19fc8e Update submodules on 'dev' in qt5
Change-Id: I0ef28d11ce0ca7d1ba5c67c36748ebf377dc6787
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-21 05:06:10 +00:00
Tony Sarajärvi
e5f0b04f12 Update Xcode 8.3.1 to macOS 10.12
Change-Id: Ie311d7374b74ce1179f7a8bb981733be016d387f
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-04-18 22:08:33 +00:00
Simon Hausmann
8b4e259b22 Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Iddf09c38c811979458639c759056a032187493de
2017-04-17 18:34:04 +00:00
Simon Hausmann
18999572b4 Update qt3d manually to pull in Ubuntu 16.04 fixes
Change-Id: Iddea4ee53f0afd5d1b2a85d190f19e82a87d61ea
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-17 11:47:41 +00:00
Liang Qi
415ea08693 Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I88192479624510cb34227f401d9e8b07977f9711
2017-04-09 09:40:45 +02:00
Qt Submodule Update Bot
5e30cba1fd Update submodules on 'dev' in qt5
Change-Id: Ie2ddd1a461354278d4570e0dc98dcf4d339183d3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-08 20:07:26 +00:00
Qt Submodule Update Bot
703e71840e Update submodules on 'dev' in qt5
Change-Id: Id5c90ac07c171d06f5d4bc06021cbfedad77a5b3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-08 14:06:40 +00:00
Qt Submodule Update Bot
c0a148bb7d Update submodules on 'dev' in qt5
Change-Id: I82c6dff79747702f65c17b094f2decad3f471cc6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-07 13:06:53 +00:00
Qt Submodule Update Bot
25113b3315 Update submodules on 'dev' in qt5
Change-Id: If1a1dc0efcd16aa0887622800394d45d11f120cb
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-02 06:13:28 +00:00
Qt Submodule Update Bot
ddc800b37f Update submodules on 'dev' in qt5
Change-Id: Ic47ce220597dda941335d6e0ea5dab224c900af3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-31 06:37:34 +00:00
Liang Qi
37e3da674c Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I370742cb0aa2b362dded7131adb08bc7af44a02b
2017-03-28 10:20:15 +02:00
Liang Qi
1da7bdd25e Update submodules on 'dev' in qt5
Change-Id: I5df7b6ba38a1e641aa8d154d8184a12cbd2f85bd
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-23 20:50:56 +00:00
Liang Qi
8889075b0d Update submodules on 'dev' in qt5
Change-Id: I9ef55bdca766e92281b92011b63ba9781f4db53f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-22 15:30:04 +00:00
Liang Qi
e9d91a3949 Update submodules on 'dev' in qt5
Change-Id: Ie422699479ce2da8c94cde3987a4685348aa7a21
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-16 06:20:31 +00:00
Liang Qi
f65308d371 Merge remote-tracking branch 'origin/5.9' into dev
This change also integrated latest dev branch of qtremoteobjects
and qtwebengine.

Conflicts:
	.gitmodules
	qtremoteobjects
        qtwebengine

Change-Id: Ic6f97f43c55bdca5d8ac0481f3bb8a73429657b9
2017-03-07 19:40:36 +01:00
Liang Qi
82cea36531 Update submodules on 'dev' in qt5
Change-Id: Ia4717e7b16c135827c15e03bb8581d2a2f196547
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-01 19:53:58 +00:00
Liang Qi
92cec830f0 Update submodules on 'dev' in qt5
Change-Id: I789836bf447b14fe223489acea9fcb898d8a35aa
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-01 05:22:15 +00:00
65 changed files with 490 additions and 98 deletions

93
.gitmodules vendored
View File

@@ -1,66 +1,66 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
branch = 5.9
branch = 5.10
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
branch = 5.9
branch = 5.10
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg qtxmlpatterns
path = qtdeclarative
url = ../qtdeclarative.git
branch = 5.9
branch = 5.10
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
branch = 5.9
branch = 5.10
status = addon
[submodule "qtscript"]
depends = qtbase
recommends = qttools
path = qtscript
url = ../qtscript.git
branch = 5.9
branch = 5.10
status = deprecated
[submodule "qtmultimedia"]
depends = qtbase
recommends = qtdeclarative
path = qtmultimedia
url = ../qtmultimedia.git
branch = 5.9
branch = 5.10
status = essential
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt
path = qttools
url = ../qttools.git
branch = 5.9
branch = 5.10
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
path = qtxmlpatterns
url = ../qtxmlpatterns.git
branch = 5.9
branch = 5.10
status = addon
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
branch = 5.9
branch = 5.10
status = essential
priority = 30
[submodule "qtdoc"]
depends = qtdeclarative
path = qtdoc
url = ../qtdoc.git
branch = 5.9
branch = 5.10
status = essential
priority = 40
[submodule "qtrepotools"]
@@ -81,14 +81,14 @@
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
path = qtlocation
url = ../qtlocation.git
branch = 5.9
branch = 5.10
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
branch = 5.9
branch = 5.10
status = addon
[submodule "qtsystems"]
depends = qtbase
@@ -121,27 +121,27 @@
recommends = qtdeclarative qtandroidextras
path = qtconnectivity
url = ../qtconnectivity.git
branch = 5.9
branch = 5.10
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
branch = 5.9
branch = 5.10
status = addon
[submodule "qt3d"]
depends = qtbase
recommends = qtdeclarative qtimageformats qtgamepad
path = qt3d
url = ../qt3d.git
branch = 5.9
branch = 5.10
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
branch = 5.9
branch = 5.10
status = addon
[submodule "qtquick1"]
depends = qtscript
@@ -154,51 +154,51 @@
depends = qtdeclarative
path = qtgraphicaleffects
url = ../qtgraphicaleffects.git
branch = 5.9
branch = 5.10
status = addon
[submodule "qtquickcontrols"]
depends = qtdeclarative
recommends = qtgraphicaleffects
path = qtquickcontrols
url = ../qtquickcontrols.git
branch = 5.9
branch = 5.10
status = essential
[submodule "qtserialbus"]
depends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
branch = 5.9
branch = 5.10
status = addon
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
branch = 5.9
branch = 5.10
status = addon
[submodule "qtx11extras"]
depends = qtbase
path = qtx11extras
url = ../qtx11extras.git
branch = 5.9
branch = 5.10
status = addon
[submodule "qtmacextras"]
depends = qtbase
path = qtmacextras
url = ../qtmacextras.git
branch = 5.9
branch = 5.10
status = addon
[submodule "qtwinextras"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtwinextras
url = ../qtwinextras.git
branch = 5.9
branch = 5.10
status = addon
[submodule "qtandroidextras"]
depends = qtbase
path = qtandroidextras
url = ../qtandroidextras.git
branch = 5.9
branch = 5.10
status = addon
[submodule "qtenginio"]
depends = qtdeclarative
@@ -211,101 +211,108 @@
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
branch = 5.9
branch = 5.10
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
branch = 5.9
branch = 5.10
status = addon
[submodule "qtwebengine"]
depends = qtquickcontrols qtwebchannel
recommends = qtlocation qttools
path = qtwebengine
url = ../qtwebengine.git
branch = 5.9
branch = 5.10
status = addon
priority = 10
[submodule "qtcanvas3d"]
depends = qtdeclarative
path = qtcanvas3d
url = ../qtcanvas3d.git
branch = 5.9
branch = 5.10
status = addon
[submodule "qtwebview"]
depends = qtdeclarative
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
branch = 5.9
branch = 5.10
status = addon
[submodule "qtquickcontrols2"]
depends = qtgraphicaleffects
recommends = qtimageformats
path = qtquickcontrols2
url = ../qtquickcontrols2.git
branch = 5.9
branch = 5.10
status = addon
[submodule "qtpurchasing"]
depends = qtbase qtandroidextras
recommends = qtdeclarative
path = qtpurchasing
url = ../qtpurchasing.git
branch = 5.9
branch = 5.10
status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
branch = 5.9
branch = 5.10
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
branch = 5.9
branch = 5.10
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols
recommends = qtmultimedia qtquickcontrols2
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = 5.9
branch = 5.10
status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad.git
branch = 5.9
branch = 5.10
status = addon
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml.git
branch = 5.9
branch = 5.10
status = addon
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtspeech
url = ../qtspeech.git
branch = 5.9
status = preview
branch = 5.10
status = addon
[submodule "qtnetworkauth"]
depends = qtbase
recommends = qtwebview
path = qtnetworkauth
url = ../qtnetworkauth.git
branch = 5.9
status = preview
branch = 5.10
status = addon
[submodule "qtremoteobjects"]
depends = qtbase
recommends = qtdeclarative
path = qtremoteobjects
url = ../qtremoteobjects.git
branch = 5.9
branch = 5.10
status = preview
[submodule "qtwebglplugin"]
depends = qtbase qtwebsockets
recommends = qtdeclarative
path = qtwebglplugin
url = ../qtwebglplugin.git
branch = 5.10
status = preview

View File

@@ -10,13 +10,15 @@ qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015
qtci-linux-Ubuntu-16.04-x86_64-2 GCC NoWidgets ForceDebugInfo
qtci-linux-Ubuntu-16.04-x86_64-2 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation
qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch
qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests
qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite
qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo
qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker
qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release
qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch
qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests
qtci-macos-10.12-x86_64-8 IOS_ANY x86_64 Clang Release DisableTests Static
qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Release DisableTests Static
qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang Release DisableTests
qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang Release DisableTests
qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC Release
qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC Release

View File

@@ -16,6 +16,8 @@ qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packagin
qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2
qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static
qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang DebugAndRelease DisableTests
qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang DebugAndRelease DisableTests
qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2

View File

@@ -0,0 +1,55 @@
#!/bin/bash
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
# This script installs paho testing broker
# shellcheck source=./InstallFromCompressedFileFromURL.sh
source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh"
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
CommitSHA="c342c09dadc7a664d0a8befad1ca031f5a0b0bc0"
PrimaryUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip"
AltUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip"
SHA1="532fe145096cdd8d679f425cbfd883289150c968"
targetFolder="/opt/paho_broker"
appPrefix="paho.mqtt.testing-$CommitSHA"
sudo rm -fr "$targetFolder"
InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
echo "Adding MQTT broker path to environment"
SetEnvVar "MQTT_TEST_BROKER_LOCATION" "$targetFolder/interoperability/startbroker.py"
echo "MQTT_BROKER = $CommitSHA" >> ~/versions.txt

View File

@@ -0,0 +1,50 @@
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
. "$PSScriptRoot\helpers.ps1"
echo "MQTT: Downloading Paho test broker..."
$zip = "c:\users\qt\downloads\pahotest.zip"
$externalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip"
$internalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip"
$sha1 = "532fe145096cdd8d679f425cbfd883289150c968"
Download $externalUrl $internalUrl $zip
Verify-Checksum $zip $sha1
echo "MQTT: Installing $zip..."
Extract-Zip $zip C:\Utils
Remove-Item $zip
echo "MQTT: Updating environment..."
[Environment]::SetEnvironmentVariable("MQTT_TEST_BROKER_LOCATION", "C:\Utils\paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0\interoperability\startbroker.py", "Machine")

View File

@@ -0,0 +1,48 @@
############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
. "$PSScriptRoot\helpers.ps1"
# This script will install Vulkan SDK
$version = "1.0.51.0"
$url_cache = "\\ci-files01-hki.ci.local\provisioning\windows\VulkanSDK-" +$version+ "-Installer.exe"
$vulkanPackage = "C:\Windows\Temp\vulkan-installer-$version.exe"
Copy-Item $url_cache $vulkanPackage
cmd /c "$vulkanPackage /S"
echo "Cleaning $vulkanPackage.."
Remove-Item -Recurse -Force "$vulkanPackage"
echo "Vulkan SDK = $version" >> ~\versions.txt

View File

@@ -0,0 +1,10 @@
. "$PSScriptRoot\helpers.ps1"
$zip = "c:\users\qt\downloads\winrtrunner.zip"
Invoke-WebRequest -UseBasicParsing http://download.qt.io/development_releases/prebuilt/winrtrunner/winrtrunner.zip -OutFile $zip
Verify-Checksum $zip "C19098A4C9DBD20EDEB4E5E0D3E6A5BBBCA73C42"
Extract-Zip $zip C:\Utils\winrtrunner
Remove-Item $zip
[Environment]::SetEnvironmentVariable("CI_WINRTRUNNER_PATH", "C:\Utils\winrtrunner", "Machine")

View File

@@ -0,0 +1,36 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh"

View File

@@ -83,6 +83,9 @@ installPackages+=(perl-Digest-SHA)
installPackages+=(glibc.i686)
# Enable Qt Bluetooth
installPackages+=(bluez-libs-devel)
# QtWebKit
installPackages+=(libxml2-devel)
installPackages+=(libxslt-devel)
sudo yum -y update
sudo yum -y install "${installPackages[@]}"

View File

@@ -0,0 +1,36 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh"

View File

@@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
echo "Installing Yocto toolchain for 32-bit b2qt..."
versionARM="2.2.2"
package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-2c947f7.sh"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/morty/$package"
AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/morty/$package"
SHA1="2583ae29951954cb27f12400fcb4ee94738d1430"
versionARM="2.3.1"
package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-41b0b46.sh"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package"
AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package"
SHA1="f17cce550c9d2148f11ae5c760f43a67e9813a45"
yoctoInstaller="/tmp/yocto-toolchain-ARMv7.sh"
yoctoLocationARMv7="/opt/yocto-armv7"
sysrootARMv7="sysroots/armv7ahf-neon-poky-linux-gnueabi"
@@ -60,11 +60,11 @@ rm -rf "$yoctoInstaller"
echo "Installing Yocto toolchain for 64-bit b2qt..."
versionARM64="2.2.2"
package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-2c947f7.sh"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/morty/$package"
AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/morty/$package"
SHA1="512b5bc1ad62af88d021eb511eeac4648d661fc6"
versionARM64="2.3.1"
package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-41b0b46.sh"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package"
AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package"
SHA1="b49d7ec8a6339dda5a82815dc31fed1fae00851d"
yoctoInstaller="/tmp/yocto-toolchain-ARM64.sh"
yoctoLocationARM64="/opt/yocto-arm64"
sysrootARM64="sysroots/aarch64-poky-linux"

View File

@@ -0,0 +1,36 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh"

View File

@@ -0,0 +1,50 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2016 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
sudo apt-get update
sudo apt-get install -y libboost-dev libboost-thread-dev libboost-system-dev libboost-program-options-dev libboost-filesystem-dev libxml2-dev libboost-regex-dev
TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory"
trap "sudo rm -fr $TEMPDIR" EXIT
cd $TEMPDIR
git clone https://github.com/FreeOpcUa/freeopcua.git freeopcua
cd freeopcua
git checkout ca75e05a8e63d88dbfc259e1251f405106411b66
mkdir build
cd build
source ~/.profile
cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local ..
make
sudo make install

View File

@@ -3,9 +3,12 @@
set -ex
sudo zypper -nq install git
# default compiler, gcc 4.8.5
sudo zypper -nq install gcc
sudo zypper -nq install gcc-c++
sudo zypper -nq install gcc7
sudo zypper -nq install gcc7-c++
sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 1 \
--slave /usr/bin/g++ g++ /usr/bin/g++-7 \
--slave /usr/bin/cc cc /usr/bin/gcc-7 \
--slave /usr/bin/c++ c++ /usr/bin/g++-7
sudo zypper -nq install bison
sudo zypper -nq install flex
@@ -17,6 +20,7 @@ sudo zypper -nq install glib2-devel
sudo zypper -nq install libopenssl-devel
sudo zypper -nq install freetype2-devel
sudo zypper -nq install fontconfig-devel
sudo zypper -nq install sqlite3-devel
# EGL support
sudo zypper -nq install Mesa-libEGL-devel
@@ -48,5 +52,13 @@ sudo zypper -nq install libXtst-devel
sudo zypper -nq install mozilla-nspr-devel
sudo zypper -nq install mozilla-nss-devel
# qtwebkit
sudo zypper -nq install libxml2-devel
sudo zypper -nq install libxslt-devel
# GStreamer (qtwebkit and qtmultimedia)
sudo zypper -nq install gstreamer-devel
sudo zypper -nq install gstreamer-plugins-base-devel
# cups
sudo zypper -nq install cups-devel

View File

@@ -9,4 +9,4 @@ sudo pkcon -y refresh
sudo pkcon -y install python-devel python-virtualenv
# install python3
sudo pkcon -y install python3 python3-pip python3-devel python3-virtualenv
sudo pkcon -y install libpython3_4m1_0 python3-base python3 python3-pip python3-devel python3-virtualenv

View File

@@ -0,0 +1,36 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh"

View File

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\vulkansdk.ps1"

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\mqtt_broker.ps1"

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\winrtrunner.ps1"

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\vulkansdk.ps1"

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\mqtt_broker.ps1"

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\winrtrunner.ps1"

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\mqtt_broker.ps1"

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\mqtt_broker.ps1"

2
qt3d

Submodule qt3d updated: ceae743678...e1d1a59eb0

2
qtbase

Submodule qtbase updated: 1cc15c4b6d...4ba535616b

2
qtdoc

Submodule qtdoc updated: 81d8e66520...d10d9f5fae

Submodule qtscxml updated: 0d6105563d...be2cb77f0c

2
qtsvg

Submodule qtsvg updated: a2156af9ed...520ebdbacb

Submodule qttools updated: 21f3960738...fb16802edc

1
qtwebglplugin Submodule

Submodule qtwebglplugin added at 235150a190