aboutsummaryrefslogtreecommitdiffstats
path: root/coin/platform_configs
Commit message (Collapse)AuthorAgeFilesLines
* Fix extra file and missing library in platform configurationsToni Saario2019-07-022-31/+1
| | | | | | | | | Missing libraries in no-gui platform. Default.txt was supposed to be removed by 439a1eb2207417a6d2d0f14766e3e627035a9a7f Change-Id: I91c7802634f69f9e5475921b3610185b386b1b1f Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
* Change configuration files into yaml formatToni Saario2019-07-0121-72/+370
| | | | | | Change-Id: I252908e9eae3a254f32a286608734b5728cd60b8 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
* Add correct openSSL arguments to no-gui buildsTony Sarajärvi2019-06-281-1/+1
| | | | | Change-Id: Ida58ff76bf154dbaf4ffb4cb18005874e10a9c46 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Add a no-opengl build on Ubuntu 18.04Tony Sarajärvi2019-06-261-0/+1
| | | | | | | | | | Task-number: QTQAINFRA-2577 Change-Id: I815adf0f85f688d9d584b95122d1944cb4b660c1 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* platform_configs: Add missing "Configure arguments" to qtconnectivity.txtOliver Wolff2019-06-251-1/+1
| | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.12.4' into 5.12Liang Qi2019-06-253-35/+56
|\ | | | | | | | | | | | | | | | | Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt Done-With: Tony Sarajärvi <tony.sarajarvi@qt.io> Change-Id: I1381c4b80a64859cb42d6cb5205ef549de40dde6
| * ogl-runtime: instead of linking to qt5.txt use the actual configurationv5.12.4wip/qt3dstudio/2.4wip/qt3d-runtime/2.4wip/ogl-runtime/2.4Antti Kokko2019-06-121-1/+21
| | | | | | | | | | | | | | | | Change-Id: I1b1d467f2c67026fc8039b7346ea8ca02250ba1c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Disable MySQL from packaging buildsHeikki Halmet2019-06-132-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 a05bd71ede9e2c67a66fd2d28fab8e9e9386e51c) Change-Id: I97d1d06b266490080325126e2dd715436a91b01a Reviewed-by: Simo Fält <simo.falt@qt.io>
| * Fix openssl 1.1 library configurationsHeikki Halmet2019-06-131-7/+7
| | | | | | | | | | | | | | | | | | Change-Id: Idcb919e5f388b509e4215cf5515c8716490d5872 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
| * Use link to qt5.txt instead of copy in qt3d-runtime.txtJani Heikkinen2019-06-091-22/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If61fe724af869fb35637321311bfb052d3009956 Reviewed-by: Antti Kokko <antti.kokko@qt.io> (cherry picked from commit c5e443374aaa7d7cdfe90a69bbe3dc33604b5d32) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Add platform configuration file for ogl-runtime repositoryAntti Kokko2019-06-101-0/+1
| | | | | | | | | | | | | | | | | | | | 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>
| * Provisioning: Change openssl version to 1.1.1bJuha Karjalainen2019-06-102-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 3e838f2a34d0c1538535bd184aa12681497c8a38)
| * Fix platform configuration filesTony Sarajärvi2019-06-103-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 d77fdecc11054c6fb0c34824935fcbfcdf644734) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Split features list between Coin and qtTony Sarajärvi2019-06-108-73/+71
| | | | | | | | | | | | | | | | | | | | | | | | 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 8cdf60fe6492490561cd6798901b201903ff6ab2) (cherry picked from commit d49c0cd0bbc535156007a9772e4561d6aaf6a105) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Remove tests from Saferenderer static buildTuomas Heimonen2019-06-101-2/+2
| | | | | | | | | | | | | | | | | | | | Task-number: QSR-458 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io> (cherry picked from commit 3cc1c40ff502ba5067fee21a9e3f7c7dc28f20a9) Change-Id: I076add99b15bfdcde903af6d94913f28c46632ee Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Fix platform configuration filesTony Sarajärvi2019-06-043-6/+10
| | | | | | | | | | | | | | | | | | 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>
* | Split features list between Coin and qtTony Sarajärvi2019-05-298-74/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 8cdf60fe6492490561cd6798901b201903ff6ab2)
* | Use link to qt5.txt instead of copy in qt3d-runtime.txtJani Heikkinen2019-05-081-22/+1
| | | | | | | | | | Change-Id: If61fe724af869fb35637321311bfb052d3009956 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* | Remove tests from Saferenderer static buildTuomas Heimonen2019-05-271-2/+2
| | | | | | | | | | | | Task-number: QSR-458 Change-Id: I076add99b15bfdcde903af6d94913f28c46632ee Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* | Enable a no-gui build on Ubuntu 18.04Tony Sarajärvi2019-05-271-0/+1
|/ | | | | | | | 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>
* Remove examples from Saferenderer static Windows buildTuomas Heimonen2019-05-211-1/+1
| | | | | | | Task-number: QSR-458 Change-Id: I3f0ba66590683ea221ccd207026602b3b89ee3a9 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
* Add static build for SaferendererHeikki Halmet2019-05-031-0/+2
| | | | | | | Task-number: COIN-229 Change-Id: I1808dbcf53a4e070167b485404c8cf9747dc04f5 Reviewed-by: Tuomas Heimonen <tuomas.heimonen@qt.io> Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
* Remove Packaging feature flag from UWP 2015 x86 integrationsAkseli Salovaara2019-05-171-1/+1
| | | | | | | | | | 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>
* Do DeveloperBuild for Boot2QtTony Sarajärvi2019-05-123-8/+2
| | | | | | Task-number: QTBUG-63152 Change-Id: I2a0239625bf5cfa4456c64e90e647c70d4533589 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Remove 32bit MSVC 2015 from the CITony Sarajärvi2019-03-231-1/+0
| | | | | | | | 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>
* Remove qt3d-runtime.txt symbolic link from platform configurationsAntti Kokko2019-02-281-1/+22
| | | | | | | | | | 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>
* Make qt3d-runtime.txt platform configuration a linkTony Sarajärvi2019-02-041-22/+1
| | | | | | | 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>
* Windows provisioning: Explicitly state OpenGL configuration to useOliver Wolff2019-01-251-1/+1
| | | | | | | | | | 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>
* Update qtsaferenderer platform configuration definitionsAapo Keskimolo2019-01-251-2/+0
| | | | | | | | | | | | | | | 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>
* Build qtsaferenderer examples in WindowsTuomas Heimonen2019-01-231-0/+1
| | | | | | Task-number: QSR-209 Change-Id: If8db177a77e3340f6b75f5a7fa768b6d8abec017 Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
* Add Qt WebAssembly for all submodulesHeikki Halmet2019-01-171-0/+1
| | | | | | Task-number: QTBUG-63917 Change-Id: I61074c8b1acbf3ffd7781e7435784c4a15412c98 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Provisioning: Move Android toolchain and config to win10Simo Fält2019-01-171-3/+3
| | | | | | | | | | 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 5a040ca46a46a3a45fa61036ca5115c4d0819034)
* Add qtsaferenderer extra targets for CoinTuomas Heimonen2019-01-111-0/+4
| | | | | | | | | | | 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 f7b6a4c27635e87cb296cd20c7596f437b37d504) Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
* Upgrade macOS 10.12.3 to 10.12.6Tony Sarajärvi2019-01-031-1/+1
| | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.12.0' into 5.12Liang Qi2018-12-221-1/+2
|\ | | | | | | Change-Id: Ifb4277657a6f85e6a6d0ee62e54360b2cb1c0514
| * Merge remote-tracking branch 'origin/5.12' into 5.12.0Liang Qi2018-10-303-3/+3
| |\ | | | | | | | | | Change-Id: I41f6780d67aeb9e065d86f53feee71d38c00428f
| * | Update qt3d-runtime.txt targetsAntti Kokko2018-10-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Add configuration to run qtconnectivity tests on winrtOliver Wolff2018-12-121-0/+3
| | | | | | | | | | | | | | | | | | Change-Id: Ib9b61b19033d4ceb7ce15ecc8c1a0227b53bb669 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Add new targets for packaging JenkinsMatti Paaso2018-11-081-0/+4
| |/ |/| | | | | | | | | | | | | 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>
* | CI platform config: Make 32 bit msvc2017 config as defaultSimo Fält2018-10-253-3/+3
|/ | | | | | | | | | | 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>
* Provisioning: macOS_10.13: Update Xcode and cmd line tools to 10.0.0Joni Jäntti2018-10-183-12/+12
| | | | | | | | | | | | | | | | 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>
* Add packaging feature for MSVC2017 32 bit buildJani Heikkinen2018-10-162-2/+2
| | | | | | Task-number: QTBUG-63708 Change-Id: Ib7897c5daffa49b014c95db5a6db9d350fe1a5e8 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Update qt3d-runtime platform_configsAndy Nichols2018-10-101-19/+21
| | | | | Change-Id: I52ad38289e6a4b385a981bcf91933378651eafe7 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Add Android arm64 targetsTony Sarajärvi2018-10-082-0/+3
| | | | | | | Task-number: QTQAINFRA-2078 Change-Id: Icbc4fa27932e2a53d43bf1c72ddd2091f2801e5c Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Optimize macOS build targets by removing excess buildsTony Sarajärvi2018-10-041-3/+1
| | | | | | Change-Id: I983f7558dabddf7e91f855dbead6dc0172db127c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Move QNX770 from macOS 10.12 to macOS 10.13Tony Sarajärvi2018-09-241-1/+1
| | | | | Change-Id: I02f0fff983349dd59f2697a050b97b761d04d3b5 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Switch MinGW to clang in Windows Android buildsTony Sarajärvi2018-09-212-48/+48
| | | | | | | | | | 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>
* Move packaging from macOS 10.12 to macos 10.13Tony Sarajärvi2018-09-191-2/+2
| | | | | | Task-number: QTQAINFRA-2056 Change-Id: I04b0a282beedce15959b416d716b63bd6197b4a3 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Provisioning: Support for WebassemblyHeikki Halmet2018-09-151-0/+2
| | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.11' into 5.12Liang Qi2018-09-121-0/+19
|\ | | | | | | Change-Id: Iac3eb41931081588a08916ddce51dae977c6ef15