aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Liang Qi2019-06-2530-159/+531
| | |\
| | | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Liang Qi2019-06-2530-159/+531
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | | * 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
| | | |
| | * | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-06-216-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idb8c2824d7d6d7359b0845fcb200d1331029cec9 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-06-195-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I3b189f1cfbf6898e35b91eb821485f3b9eeb678b Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-06-1837-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I673d342cd906782d8444eebcb8e16ad6cec827f0 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Update submodules on '5.12' in qt5Liang Qi2019-06-1811-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore qtvirtualkeyboard temporarily. Task-number: QTBUG-76371 Change-Id: I6d62f0f60b30044baaef092cbd8066bbca8d0df7 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-06-056-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibd78f70d7795b3927093d1f7de3cb59db2693cac Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | * | 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>
| | * | Update submodules on '5.12' in qt5Liang Qi2019-06-0312-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip qtbase in this round. Change-Id: Ibe33457533596f164b2d6342329378604e845720 Reviewed-by: Liang Qi <liang.qi@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)
| | * | Update GCC version to 9.1.0 in Ubuntu 18.04Tony Sarajärvi2019-05-312-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-2958 Change-Id: I3ea8c8e467b9a1f56c2b114c40fb94dfdc1448d0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Provisioning: Install virtualenv to Ubuntu 18.04Simo Fält2019-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The python3-virtualenv package is missing the actual virtualenv executable. python3-virtualenv will get installed as dependency. Change-Id: If474831e8f46ac5dcd7e1028c97c7322c5e41b9d Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * | 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>
| | * | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-05-247-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6a580364ce78fdb792eab228d4ace789fb6e5c25 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | * | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-05-2118-0/+0
| | |/ | | | | | | | | | | | | | | | Change-Id: Ib9074112780183225f5620edb3d02fa60f3af4c9 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>
| | * 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.13' in qt5Qt Submodule Update Bot2019-08-011-0/+0
| | | | | | | | | | | | | | | Change-Id: Ia8f240a565043822fec60ce29b348bb79846919e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-08-019-0/+0
| | | | | | | | | | | | | | | Change-Id: I6f218e6cc6c7de9a4f87f63814e01079a7ab1b02 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * | Add webAssembly build for windows and macosJuha Karjalainen2019-07-317-19/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provision emsdk and its dependecies to windows and macos. Task-number: QTBUG-63917 Task-number: QTQAINFRA-2835 Done-with: Juha Karjalainen <juha.karjalainen@qt.io> Change-Id: I24ea9cbc4f7cc95e6952765099d5e46247470011 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-07-303-0/+0
| | | | | | | | | | | | | | | Change-Id: I78f3250367bf544dd8a5b5f1a0cd91c20655e065 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | Adjust submodule branchesFrederik Gladhorn2019-07-291-40/+40
|/ / | | | | | | Change-Id: I65388af02c1ab3608abf7e18a89966020e213d10
* | Disable tests for MSVC2015/Win32/64bitFriedemann Kleint2019-07-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Frequent crashes of tst_QDir have been again observed recently in the dev branch with MSVC2015. It should be sufficient to test MSVC2017; MSVC2015 should only be compile-tested. Task-number: QTBUG-58654 Change-Id: I0eb5a1294432a24548468c993418bc18671547bb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Dimitrios Apostolou <dimitrios.apostolou@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-07-282-0/+0
| | | | | | | | | | Change-Id: I0f92c902424fc5e58158921235b582ef7a7ddc91 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-07-275-0/+0
| | | | | | | | | | Change-Id: If1822246b0553ed5d550c766a8e3700fd7c14068 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-14 19:17:36 +0000