aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Update submodules on '5.12.4' in qt5Qt Submodule Update Bot2019-06-133-0/+0
| | | | | | | | Change-Id: I2b8b3fc60e242872f1cfb850c6219a72b39d471a 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-132-7/+13
| | | | | | | | | Change-Id: Idcb919e5f388b509e4215cf5515c8716490d5872 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
* Update submodules on '5.12.4' in qt5Qt Submodule Update Bot2019-06-112-0/+0
| | | | | Change-Id: Id04721e958f15621a0a5b35aa0d44dc2d7238549 Reviewed-by: Jani Heikkinen <jani.heikkinen@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>
* Update submodules on '5.12.4' in qt5Qt Submodule Update Bot2019-06-1041-0/+0
| | | | | | | | | | Change-Id: Ic0a4f9340c23cc8a7b502870e690d1fccb54425f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Install prebuilded OpenSSL 1.1.1b for Windows 7Heikki Halmet2019-06-101-49/+18
| | | | | | | | | | | | Change-Id: Ie1ec2d6aaeea8432a654741ed7969cc66c3da7f5 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 247b429c3c435a62df3d6f94c96c7cd1b7c22299)
* Provision sed for windows 10Juha Karjalainen2019-06-103-0/+73
| | | | | | | | | | | | | | | | | Sed is needed by webassembly build. Cannot use sed from msys as having msys bin folder in path breaks webassembly build. Task-number: QTQAINFRA-2835 Change-Id: I6ad06f0a952a0d8bc5d21e62f8c2cef70f40c618 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 230a73409a2fe58e7de0674107a2d870be0bf03d) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Provisioning: install msys2Juha Karjalainen2019-06-102-0/+71
| | | | | | | | | | | Windows need msys2 perl for configuring openssl 1.1.1 for android. Task-number: QTQAINFRA-2327 Change-Id: I217542b6e9b3fd0f656b8186e2cde4283257dcf8 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 6465c421225574dc1c5d9f23293c37e784fd1b02) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Provisioning: Change openssl version to 1.1.1bJuha Karjalainen2019-06-1021-126/+356
| | | | | | | | | | | | | | 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>
* Provisioning: Use ANDROID_NDK_ROOT instead of ANDROID_NDK_HOMEHeikki Halmet2019-06-102-0/+2
| | | | | | | | | | | | Without this binaries will be hardcoded to look in e.g /opt/android/android-ndk-r19b which means that RTA tests will fail Task-number: QTBUG-74952 Change-Id: Ic2b1297e15d905f2250333b6bc884abe2f1472d4 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit dbaa42baa77309a1aa407cd45078d885f7428aa2) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Provisioning: Update Android NDK to version r19Heikki Halmet2019-06-103-8/+8
| | | | | | | | | | | | Also let's start using 64-bit Android NDK for Windows Task-number: QTQAINFRA-2568 Change-Id: I2d757aa9e43abf5118abad7bf644e17e88a2ca94 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit c09135cb56e03dd6a09b79f2c6e15932e9433df2) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update submodules on '5.12.4' in qt5Qt Submodule Update Bot2019-05-2741-0/+0
| | | | | | Change-Id: I73e3a64a4f9b0255c6e82ba638bf1f783e9867db Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Adjust submodule branchesFrederik Gladhorn2019-05-211-40/+40
|
* 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>
* Log more version information on macOS provisioningJuha Karjalainen2019-05-124-0/+108
| | | | | | | | | Logs more version information to make easier to reproduce build. Logs macOS build version, homebrew installed packages and apple's installer installed packages. Change-Id: Ia9f2842a3fd2e8e0acf1667c7435a19c7a878aed Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Do DeveloperBuild for Boot2QtTony Sarajärvi2019-05-124-8/+8
| | | | | | Task-number: QTBUG-63152 Change-Id: I2a0239625bf5cfa4456c64e90e647c70d4533589 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-05-0814-0/+0
| | | | | Change-Id: Ie7ea68d3f32ca9348ca7f5f7017f6e86c00b860d Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-04-3010-0/+0
| | | | | Change-Id: If055179b9dfbc4af842c4972cabb79c2966d57d8 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Update submodules on '5.12' in qt5Liang Qi2019-04-268-0/+0
| | | | | Change-Id: I69ecf3e1a1f7b5dbdc6e86478475f9563854dac6 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.12.3' into 5.12" into ↵Liang Qi2019-04-260-0/+0
|\ | | | | | | refs/staging/5.12
| * Merge remote-tracking branch 'origin/5.12.3' into 5.12Liang Qi2019-04-250-0/+0
| |\ | | | | | | | | | Change-Id: Ib5cb484726a93f7b317e1dd8e74b446e6673cdbd
| | * Update submodules on '5.12.3' in qt5v5.12.3wip/qt3dstudio/runtime2wip/qt3d-runtime/masterQt Submodule Update Bot2019-04-1114-0/+0
| | | | | | | | | | | | | | | Change-Id: I173c80b1d080350d41108aac01b8d66de0dcfb56 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Update submodules on '5.12.3' in qt5Qt Submodule Update Bot2019-04-0535-0/+0
| | | | | | | | | | | | | | | Change-Id: I216b93959076bc9402c715599398dea770cacde2 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Update submodules on '5.12.3' in qt5Qt Submodule Update Bot2019-03-307-0/+0
| | | | | | | | | | | | | | | Change-Id: I34e1bd8f276b6e9eb2a1f658f2447fdd01fd4d09 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * Adjust submodule branchesKari Oikarinen2019-03-251-40/+40
| | | | | | | | | | | | Change-Id: I28500be5d253a4d047cef1409659c275c314d5b0
* | | Provisioning: Install python36-devel to rhel 7.4Simo Fält2019-04-251-0/+1
|/ / | | | | | | | | | | | | | | The rhel Python3 system package is missing development libs. Fixes: PYSIDE-996 Change-Id: I3863c85ad04021dd0f0d4af4bae5917a6785a7e1 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | Provisioning: Install Vulkan to Rhel 7.4Heikki Halmet2019-04-251-0/+2
| | | | | | | | | | | | | | | | | | Enables Vulkan support at compile time Task-number: QTBUG-72763 Change-Id: If97adb030d50a147c9714afe3ef360291904b58a Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-04-247-0/+0
| | | | | | | | | | Change-Id: I2c02e38847615cace282fa261ac5ac526eb6ece2 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-04-2337-0/+0
| | | | | | | | | | Change-Id: I2fa664d7b94bf511d4321e0698aba679ccb38ad0 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Provisioning: Remove MSVC 2015 update 3 patch from provisioningHeikki Halmet2019-04-181-34/+0
| | | | | | | | | | | | | | | | | | | | | | | | MSVC 2015 update 3 patch seems to be already pre-provisioned with MSVC 2015 update installation Task-number: QTQAINFRA-2899 Change-Id: I582c47e4b54303394805f205c4becf6a74e941ec Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit b3e35cbac501c749cd17a48c8fc85ef6f8acbba7) Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-04-164-0/+0
| | | | | | | | | | Change-Id: I01acdb8d1dc3137abb193a9ccf1dba20d6953bcb Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-04-146-0/+0
| | | | | | | | | | Change-Id: Ie4120272ceba142d35265f2fbde316e2af8b30a9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-04-127-0/+0
| | | | | | | | | | Change-Id: I79cbed7287f7b160624b77b08df04d8fd33c7907 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-04-119-0/+0
| | | | | | | | | | Change-Id: Ibe1d38a062889777ab9d8dc5ec4d2fb46e8b4cb6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Provisioning: Echo Emscripten version information to versions.txtHeikki Halmet2019-04-101-1/+4
| | | | | | | | | | | | | | Change-Id: I0ad9b2299805534d1f635fd89ac74d4feb8ce5c4 Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-04-106-0/+0
| | | | | | | | | | Change-Id: If36b8642907dc68d9d53cfe01bfa91a9d25f3fff Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-04-0913-0/+0
| | | | | | | | | | Change-Id: I0e3a8b053ca414cff6e066f24514727b25e444bf Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Provisioning: Install i686 mingw on Windows 10 X64Ivan Donchevskii2019-04-082-2/+14
| | | | | | | | | | | | | | | | Required to compile 32-bit binaries. Fixes: QTQAINFRA-2896 Change-Id: I91a43ecf6e2c97886429c34c79591999b908879f Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | Fix shellcheck complaints from provisioning scriptsTony Sarajärvi2019-04-0160-50/+93
| | | | | | | | | | | | Change-Id: I8d1ee4241d7e99269e8c717ceb2aecde3194c51a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | Fix soft links and file modes of a few macOS provisioning scriptsTony Sarajärvi2019-04-014-15/+46
| | | | | | | | | | | | Change-Id: I1d4d09424aa2ce0b75d840a2c26cbfed99740d0c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-03-2810-0/+0
| | | | | | | | | | Change-Id: I2df7f448e6f121039e343b3dd87d7fbbcbef25fd Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-03-2711-0/+0
|/ | | | | Change-Id: I7e7a49b60f4082d177c59dd3ccdd752fc4e3c5ca Reviewed-by: Liang Qi <liang.qi@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-16 21:34:53 +0000