Commit Graph

197 Commits

Author SHA1 Message Date
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
Tony Sarajärvi
8c4ac28b0d Add correct openSSL arguments to no-gui builds
Change-Id: Ida58ff76bf154dbaf4ffb4cb18005874e10a9c46
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-06-28 11:43:45 +03:00
Tony Sarajärvi
d494d76c26 Add a no-opengl build on Ubuntu 18.04
Task-number: QTQAINFRA-2577
Change-Id: I815adf0f85f688d9d584b95122d1944cb4b660c1
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-06-26 10:14:17 +03:00
Oliver Wolff
0c339c29d6 platform_configs: Add missing "Configure arguments" to qtconnectivity.txt
Without the tag configure arguments will not be parsed by Coin so that
wrong configurations will be used.

Change-Id: I02f84cde07e9e4cf878add89ba9ba43dacf9d567
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-25 10:29:17 +02:00
Liang Qi
34a13ff5d9 Merge remote-tracking branch 'origin/5.12.4' into 5.12
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Done-With: Tony Sarajärvi <tony.sarajarvi@qt.io>
Change-Id: I1381c4b80a64859cb42d6cb5205ef549de40dde6
2019-06-25 10:29:08 +02:00
Antti Kokko
6e350aff34 ogl-runtime: instead of linking to qt5.txt use the actual configuration
Change-Id: I1b1d467f2c67026fc8039b7346ea8ca02250ba1c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-12 15:15:32 +03:00
Heikki Halmet
d87d4e0219 Disable MySQL from packaging builds
We can't link against 3rd party GPL libraries

Task-number: QTBUG-76081
Change-Id: Ia78c58b14349078259488eafb592c2f70dbf7241
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit a05bd71ede)

Change-Id: I97d1d06b266490080325126e2dd715436a91b01a
Reviewed-by: Simo Fält <simo.falt@qt.io>
2019-06-13 05:52:55 +00:00
Heikki Halmet
de41591477 Fix openssl 1.1 library configurations
Change-Id: Idcb919e5f388b509e4215cf5515c8716490d5872
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2019-06-13 08:29:02 +03:00
Jani Heikkinen
01c38dfad8 Use link to qt5.txt instead of copy in qt3d-runtime.txt
Change-Id: If61fe724af869fb35637321311bfb052d3009956
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
 
(cherry picked from commit c5e443374a)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-09 17:18:19 +03:00
Antti Kokko
1db94fc9ef Add platform configuration file for ogl-runtime repository
Use configuration from qt5.txt.

Change-Id: Ic788b70545169ee1fce5a97f016882cacd4a7908
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 11:49:11 +03:00
Juha Karjalainen
31f5c48a80 Provisioning: Change openssl version to 1.1.1b
Use newest LTS version of openssl as support for 1.0.2 series
will end at end of 2019.

For windows 7 x86 openssl 1.0.2 will be used until all need fixed
are made to submodule tests

Task-number: QTQAINFRA-2327
Change-Id: I930d239cd139b6202ebdfb5cdc8068ff2ad0b8a3
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 3e838f2a34)
2019-06-10 10:07:20 +00:00
Tony Sarajärvi
5fd662b550 Fix platform configuration files
Typos, duplicate entries and one missing rebase ended up
in the initial cherry-pick from 5.13

Change-Id: Ibf0fdb8cbc62f8223a0ede89ad4c013ceb7d145e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 
 
(cherry picked from commit d77fdecc11)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 10:16:58 +03:00
Tony Sarajärvi
6c6c6ca1a5 Split features list between Coin and qt
Start using configure args as configure string instead of flags.

Task-number: QTQAINFRA-2744
Change-Id: I2ce189531df7ba805d18b36615259bf0303e7175
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 8cdf60fe64)
(cherry picked from commit d49c0cd0bb)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 10:16:52 +03:00
Tuomas Heimonen
1cf289d182 Remove tests from Saferenderer static build
Task-number: QSR-458

Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>

(cherry picked from commit 3cc1c40ff5)
Change-Id: I076add99b15bfdcde903af6d94913f28c46632ee
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 17:25:13 +00:00
Tony Sarajärvi
d77fdecc11 Fix platform configuration files
Typos, duplicate entries and one missing rebase ended up
in the initial cherry-pick from 5.13

Change-Id: Ibf0fdb8cbc62f8223a0ede89ad4c013ceb7d145e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-06-04 11:10:57 +03:00
Tony Sarajärvi
d49c0cd0bb Split features list between Coin and qt
Start using configure args as configure string instead of flags.

Task-number: QTQAINFRA-2744
Change-Id: I2ce189531df7ba805d18b36615259bf0303e7175
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 8cdf60fe64)
2019-05-29 15:09:40 +03:00
Tuomas Heimonen
25349a29f7 Remove examples from Saferenderer static Windows build
Task-number: QSR-458
Change-Id: I3f0ba66590683ea221ccd207026602b3b89ee3a9
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
2019-05-21 09:59:12 +03:00
Jani Heikkinen
c5e443374a Use link to qt5.txt instead of copy in qt3d-runtime.txt
Change-Id: If61fe724af869fb35637321311bfb052d3009956
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2019-05-08 12:53:18 +03:00
Tuomas Heimonen
3cc1c40ff5 Remove tests from Saferenderer static build
Task-number: QSR-458
Change-Id: I076add99b15bfdcde903af6d94913f28c46632ee
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
2019-05-27 09:12:34 +00:00
Tony Sarajärvi
8d8b7d796f Enable a no-gui build on Ubuntu 18.04
Task-number: QTQAINFRA-2576
Change-Id: Iafdecb0571779077b722bde7521da681f00f6f60
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-27 10:31:13 +03:00
Heikki Halmet
7e0fe78315 Add static build for Saferenderer
Task-number: COIN-229
Change-Id: I1808dbcf53a4e070167b485404c8cf9747dc04f5
Reviewed-by: Tuomas Heimonen <tuomas.heimonen@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-05-03 14:18:33 +03:00
Akseli Salovaara
56134fd7f6 Remove Packaging feature flag from UWP 2015 x86 integrations
UWP 2015 x86 binaries are not published anymore. Speed-up export
tool and reduce exported data disk space consumption by removing
Packaging feature flag from UWP 2015 x86 configurations.

Task-number: QTBUG-73544
Change-Id: Iad2016b6e6aec1787c7bbf31c6ef6f71db905c21
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-05-17 09:10:32 +00:00
Tony Sarajärvi
8f073cea69 Do DeveloperBuild for Boot2Qt
Task-number: QTBUG-63152
Change-Id: I2a0239625bf5cfa4456c64e90e647c70d4533589
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-05-12 13:02:16 +00:00
Tony Sarajärvi
665703efc9 Remove 32bit MSVC 2015 from the CI
Task-number: QTQAINFRA-2251
Change-Id: I4006c7390759e2eb357309de36eb23af007a576e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2019-03-23 08:32:35 +00:00
Antti Kokko
091820f6a1 Remove qt3d-runtime.txt symbolic link from platform configurations
Caused recursion in CI platform configuration parsing algorithm.
Add qt3d-runtime.txt back as regular file.

Task-number: QTQAINFRA-2804
Change-Id: I11c42a70dcd2157501d4b1f0f67fc7a77a575d31
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-02-28 04:08:21 +00:00
Tony Sarajärvi
4987a682ff Make qt3d-runtime.txt platform configuration a link
The content of qt3d-runtime.txt should always be the same as qt5.txt.

Change-Id: I6cdee575206332f6a719acfaacd7072a2178fd78
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-02-04 11:11:43 +00:00
Oliver Wolff
92b7d48bc2 Windows provisioning: Explicitly state OpenGL configuration to use
One of our configurations relied on ANGLE being the default OpenGL
configuration on Windows. This is the case at the moment, but might
change, so we should not rely on this behavior, but explicitly state the
configuration we are expecting.

Change-Id: Ie8cb215c2675faf8b514f4d9a43055638be1aaa8
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2019-01-25 11:57:42 +00:00
Aapo Keskimolo
daf0d3a4c6 Update qtsaferenderer platform configuration definitions
The project-specific platform configuration file is renamed to follow the
convention as for other projects. This will allow Coin to recognize the
configuration that are specific for qtsaferenderer project where they
were previously (unintentionally) ignored.

Removed QNX 7 as it is in the Qt mainline configuration.

Removed Ubuntu 16.04 as Ubuntu 18.04 is now supported.

Task-number: QSR-209
Change-Id: I505edc3741dbc047b2fc23bc409016d712596872
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-01-25 09:02:08 +00:00
Tuomas Heimonen
22f032bd02 Build qtsaferenderer examples in Windows
Task-number: QSR-209
Change-Id: If8db177a77e3340f6b75f5a7fa768b6d8abec017
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-01-23 13:31:36 +00:00
Heikki Halmet
4ddadb9aa3 Add Qt WebAssembly for all submodules
Task-number: QTBUG-63917
Change-Id: I61074c8b1acbf3ffd7781e7435784c4a15412c98
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2019-01-17 13:03:27 +00:00
Simo Fält
6d2929d1aa Provisioning: Move Android toolchain and config to win10
Installing Android toolchains and ssl headers to win10 template
and moving Android windows platform configs to win10 from win7.

Task-number: QTQAINFRA-1266
Change-Id: I9b3e3a378451e0bdfc7dc5c7b75ee035faf8994c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 5a040ca46a)
2019-01-17 09:45:05 +00:00
Tuomas Heimonen
6930998900 Add qtsaferenderer extra targets for Coin
The cross-compile targets that qtsaferenderer needs do not exist in qt5
therefore we add those extra targets for CI.

Task-number: QSR-378
Change-Id: Ia07074392b09af8d111a957027407f85518e5d85
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
(cherry picked from commit f7b6a4c276)
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
2019-01-11 11:21:58 +00:00
Tony Sarajärvi
2657a96f0e Upgrade macOS 10.12.3 to 10.12.6
Also changes the resolution of the desktop to 1280x800x32,
timezone to GMT and upgrades Xcode.

Task-number: QTBUG-70180
Change-Id: I4620cbfa3033a100b0e325951a5a9ebcbfa92751
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-03 12:59:57 +00:00
Liang Qi
0e82de327b Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: Ifb4277657a6f85e6a6d0ee62e54360b2cb1c0514
2018-12-22 23:21:54 +01:00
Oliver Wolff
7bee789af3 Add configuration to run qtconnectivity tests on winrt
Change-Id: Ib9b61b19033d4ceb7ce15ecc8c1a0227b53bb669
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2018-12-12 13:49:45 +00:00
Matti Paaso
f335f71d02 Add new targets for packaging Jenkins
Change-Id: If2a769ef74ef01f663cc7673477346009d593e38
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-11-08 13:51:34 +00:00
Liang Qi
d3299a3d27 Merge remote-tracking branch 'origin/5.12' into 5.12.0
Change-Id: I41f6780d67aeb9e065d86f53feee71d38c00428f
2018-10-30 12:22:55 +01:00
Antti Kokko
01faa84629 Update qt3d-runtime.txt targets
Add missing macOS and Windows Android arm64 targets.
Remove iOS target that is now included in default.txt.

Change-Id: Ifc20336b94477b2f8be456ef7f7f8bfaf8bf1190
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-10-30 09:56:38 +00:00
Simo Fält
d65d71731f CI platform config: Make 32 bit msvc2017 config as default
Swapping 32 bit windows packaging configs so that MSVC 2017 is
built as default config and MSVC 2015 only for qt5.

As the config is not part of the default.txt we have to add it as
module specific config.

Change-Id: I3c423c2c80d0093fdeca340d6faa8e162c03b5cd
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-10-25 12:35:07 +00:00
Joni Jäntti
7e40cd3a7f Provisioning: macOS_10.13: Update Xcode and cmd line tools to 10.0.0
Xcode and command line tools version 10 have been released, we
should start building our Qt releases with it, both for iOS and
macOS.

Installing Xcode 10.0.0 requires OS version update to 10.13.6. A new
tier 1 image has been created with the updated OS and this change
takes it into use.

Task-number: QTQAINFRA-2274
Change-Id: Ida7df234ecfd356b2cb2545ae10cd501dc47197b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2018-10-18 10:59:34 +00:00
Jani Heikkinen
0b1493a840 Add packaging feature for MSVC2017 32 bit build
Task-number: QTBUG-63708
Change-Id: Ib7897c5daffa49b014c95db5a6db9d350fe1a5e8
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2018-10-16 13:59:16 +00:00
Andy Nichols
80aa7d0018 Update qt3d-runtime platform_configs
Change-Id: I52ad38289e6a4b385a981bcf91933378651eafe7
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2018-10-10 11:26:02 +00:00
Tony Sarajärvi
61c4be2c0b Add Android arm64 targets
Task-number: QTQAINFRA-2078
Change-Id: Icbc4fa27932e2a53d43bf1c72ddd2091f2801e5c
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-10-08 18:21:50 +00:00
Tony Sarajärvi
e85296ba98 Optimize macOS build targets by removing excess builds
Change-Id: I983f7558dabddf7e91f855dbead6dc0172db127c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2018-10-04 08:03:27 +00:00
Tony Sarajärvi
a620807118 Move QNX770 from macOS 10.12 to macOS 10.13
Change-Id: I02f0fff983349dd59f2697a050b97b761d04d3b5
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-24 17:13:22 +00:00
Tony Sarajärvi
f1256e1f39 Switch MinGW to clang in Windows Android builds
Also as target_compiler is a column now, let's
add the missing information about android target
compiler in the rest of the configurations as well.

Task-number: QTQAINFRA-1682
Change-Id: I6de1ea40383512f5fb8b55242f1a1ac264f9d7d6
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-21 16:33:36 +00:00
Tony Sarajärvi
00958e9430 Move packaging from macOS 10.12 to macos 10.13
Task-number: QTQAINFRA-2056
Change-Id: I04b0a282beedce15959b416d716b63bd6197b4a3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-19 08:18:21 +00:00
Heikki Halmet
0e0d99d617 Provisioning: Support for Webassembly
This change will install specified packages of Emscripten and set up
the build environment for making binary artifacts of WebAssembly

Task-number: QTQAINFRA-1972
Change-Id: Ia5df6c208ea8f29ca8948f0273f321a59fc694a2
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2018-09-15 10:06:47 +00:00
Liang Qi
dada6497fb Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: Iac3eb41931081588a08916ddce51dae977c6ef15
2018-09-12 21:50:27 +02:00