aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update submodules on '5.12.0' in qt5v5.12.0wip/qt3dstudio/2.2wip/qt3d-runtime/2.2Qt Submodule Update Bot2018-12-031-0/+0
| | | | | Change-Id: I17131af760308b6520dd702eaf7aaf03b9a7d706 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update submodules on '5.12.0' in qt5v5.12.0-rc2Qt Submodule Update Bot2018-11-286-0/+0
| | | | | Change-Id: Id850c3339ddc5fe82ee9c0ef13340e56001fbd15 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update submodules on '5.12.0' in qt5v5.12.0-rc1Qt Submodule Update Bot2018-11-205-0/+0
| | | | | Change-Id: Ice89787923481000fca0409665a366ab8c3540be Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update submodules on '5.12.0' in qt5Qt Submodule Update Bot2018-11-158-0/+0
| | | | | Change-Id: Ib05608e04fe7128046e0573e6c029262e2f8280b Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Provisioning: Fix path for fbx filesHeikki Halmet2018-11-132-25/+13
| | | | | | | | | | Currently Qt3d Studio build don't recognize fbx path because of space in folder name. This change will fix it by taken use the packages which don't have space in the folder name. Task-number: QT3DS-2440 Change-Id: I502bb04489a03a5a81e164f8a86f3200f4ec3910 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update submodules on '5.12.0' in qt5Qt Submodule Update Bot2018-11-118-0/+0
| | | | | Change-Id: I8c971bdcbbca07a8ec03cc4a3dda56ada4afcd00 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update submodules on '5.12.0' in qt5Qt Submodule Update Bot2018-11-0920-0/+0
| | | | | Change-Id: If218ebc667e5378b1a2527f42c93c456045f1f45 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update submodules on '5.12.0' in qt5Qt Submodule Update Bot2018-11-077-0/+0
| | | | | Change-Id: Ie4dca9cdf3a39a21cd8c380204860ee578733463 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.12.0' in qt5v5.12.0-beta4Qt Submodule Update Bot2018-11-063-0/+0
| | | | | Change-Id: I41d60616e029d96bb6580345a59ff906ded608d5 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Add 'qttools' dependency for WebEngineMichal Klocek2018-11-051-1/+1
| | | | | | | | | | QtTools module is required for designer plugin. Fixes: QTBUG-71404 Change-Id: I081740679dace196b9ff42d98bddd941848738f8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Update submodules on '5.12.0' in qt5Qt Submodule Update Bot2018-11-0524-0/+0
| | | | | Change-Id: Ic6ce42f23f2e567e79d69180b986ae25e97ea1c7 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Graduate qtremoteobjects and qtwebglpluginLiang Qi2018-11-021-2/+2
| | | | | | Change-Id: I07a55764a4a6900d233d4bcfa20344009a9add26 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update submodules on '5.12.0' in qt5Liang Qi2018-11-0219-0/+0
| | | | | Change-Id: I2dc837b9d8e75176c5ecd3c42e17892676c1f65d Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.12' into 5.12.0Liang Qi2018-10-308-15/+15
|\ | | | | | | Change-Id: I41f6780d67aeb9e065d86f53feee71d38c00428f
| * Update submodules on '5.12' in qt5Qt Submodule Update Bot2018-10-299-0/+0
| | | | | | | | | | Change-Id: I33be3020b077a33f128f18bc920aa89746ba5590 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Provisioning: Update openssl to version 1.0.2pJuha Karjalainen2018-10-265-12/+12
| | | | | | | | | | | | Task-number: QTQAINFRA-2266 Change-Id: I3f09d9169f17bcd83dcfd72547440bca487fd9db Reviewed-by: Simo Fält <simo.falt@qt.io>
| * Update submodules on '5.12' in qt5Qt Submodule Update Bot2018-10-267-0/+0
| | | | | | | | | | Change-Id: I38d842c7d9df454cd653ca48574023b25512c62c Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update submodules on '5.12' in qt5Qt Submodule Update Bot2018-10-254-0/+0
| | | | | | | | | | Change-Id: Iba893056096d70731449005033a5e3e13d6650c7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * 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>
| * Update submodules on '5.12' in qt5Qt Submodule Update Bot2018-10-248-0/+0
| | | | | | | | | | Change-Id: I86f12f4294fcda16d1aff7ee73681d9fef37403e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '5.12' in qt5Qt Submodule Update Bot2018-10-237-0/+0
| | | | | | | | | | Change-Id: Ia2c18f2579af6a1c3e0277cf73a1a219e14b5295 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | 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>
* | Adjust submodule branchesOswald Buddenhagen2018-10-221-40/+40
|/ | | | Change-Id: I43f7c5c76e0cd646e506e7071e9e8c450bdc1b03
* Update submodules on '5.12' in qt5v5.12.0-beta3Qt Submodule Update Bot2018-10-222-0/+0
| | | | | Change-Id: I8e2e7811ac09b65cb81b45c4aa48bf4e57885c71 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.12' in qt5Qt Submodule Update Bot2018-10-215-0/+0
| | | | | Change-Id: Ie8e19006d5e007e732ca0f68d8128ac3dfc8f498 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update Android NDK and SDK on macOS envsTony Sarajärvi2018-10-201-6/+9
| | | | | | | Task-number: QTQAINFRA-2244 Change-Id: I20994bc7a64edefda09da68c4beddde4dc9948aa Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update Android NDK and SDK on Windows envsTony Sarajärvi2018-10-202-40/+42
| | | | | | | Task-number: QTBUG-47672 Change-Id: I3e6526b296f15927b90ab3310d91f8505b0228b3 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update Android NDK and SDK on Linux envsTony Sarajärvi2018-10-201-6/+14
| | | | | | | | | Task-number: QTBUG-47672 Task-number: QTQAINFRA-2298 Done-with: Liang Qi <liang.qi@qt.io> Change-Id: I42c87d8453423530173b826c09dc6eb4bf9ad5b8 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.12' in qt5Qt Submodule Update Bot2018-10-197-0/+0
| | | | | Change-Id: I09368e4171c76cc52110b7778491d512d0d43de1 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Provisioning: Windows_7_x86: libclangJoni Jäntti2018-10-181-0/+1
| | | | | | | | | libclang is required for qdoc. Task-number: QTBUG-69793 Change-Id: I60b54b4338ed6fd3bae99813e268816e063c648a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Provisioning: macOS_10.13: Update Xcode and cmd line tools to 10.0.0Joni Jäntti2018-10-185-15/+15
| | | | | | | | | | | | | | | | 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>
* fix setting QTDIR_build for default_pre.prfOswald Buddenhagen2018-10-181-3/+9
| | | | | | | | | | | | | | | | | | adding it to the super cache makes no sense, as that's read before spec_pre.prf, which clears CONFIG. use the regular cache instead. submodules do not inherit that setting, and they don't need to as per comment. also, don't keep adding it to the cache - the cache() function doesn't check whether the added value is already present, so we need to do that manually. amends 31590c0b65. Fixes: QTBUG-63452 Change-Id: I608559a80a7c772dbdaacfaaadb4fc268b442c39 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Update submodules on '5.12' in qt5Qt Submodule Update Bot2018-10-1814-0/+0
| | | | | Change-Id: Ica33ddf6fa348ed65f7194127c80b6e539462e6a Reviewed-by: Liang Qi <liang.qi@qt.io>
* Make quickcontrols1/2 and webchannel optional for webengineMichal Klocek2018-10-161-2/+2
| | | | | | Fixes: QTBUG-70784 Change-Id: I845216123f7638afd69b39d5da8020a449ab40b8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Provisioning: Use /dev/null when dealing with passwordsHeikki Halmet2018-10-161-9/+9
| | | | | | | | This will prevent passwords showing in provisioning logs. Task-number: QTQAINFRA-2261 Change-Id: I501fd3be64514c59a604c1116113eaf975208024 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* 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>
* Provisioning: Disable powershell quickeditv5.12.0-beta2Juha Karjalainen2018-10-133-0/+15
| | | | | | | | | | | Powershell quickedit causes powershell window freeze until quickedit mode is exited by pressing enter. For some reason quickedit mode get's activated during build. This causes time out as agent does not get any output from processes. Task-number: QTQAINFRA-2263 Change-Id: I2878cc7a39bae504f826c5622cc5817fd227d7f0 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Update submodules on '5.12' in qt5Qt Submodule Update Bot2018-10-1314-0/+0
| | | | | Change-Id: I93231f063bc3c3d29add8ade27803c8f87572dde Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update qt3d-runtime platform_configsAndy Nichols2018-10-101-19/+21
| | | | | Change-Id: I52ad38289e6a4b385a981bcf91933378651eafe7 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Update submodules on '5.12' in qt5Qt Submodule Update Bot2018-10-107-0/+0
| | | | | Change-Id: If26ce4b6686cf5a704c9d64298a23159780a39e0 Reviewed-by: Liang Qi <liang.qi@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>
* Update submodules on '5.12' in qt5Qt Submodule Update Bot2018-10-0715-0/+0
| | | | | Change-Id: Ibe3ea201ddcb9c555d458296e0f12fcc03fcf0e2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Provisioning: Ubuntu_16.04_x64: Use internal mirrorJoni Jäntti2018-10-051-7/+11
| | | | | | | | | | Currently the internal package mirroring is being enabled only after the installation of the packages. It should be done before to actually download them from the internal repo instead of the official repos. Change-Id: I4aeb2e463ae804bd2f8ce9536ab89fc26fedbdb5 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Provisioning: Ubuntu 18.04: Use internal package mirrorJoni Jäntti2018-10-041-3/+16
| | | | | | | | | Using internal package mirror during provisioning reduces outgoing web traffic by a huge amount. Task-number: QTQAINFRA-2213 Change-Id: I6a63b51efbf411a712795a6347c2deeed6ac44d3 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@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>
* Update submodules on '5.12' in qt5v5.12.0-beta1Qt Submodule Update Bot2018-10-036-0/+0
| | | | | | | Updated qtwebengine once againt to have a fix for getting beta1 out Change-Id: I3de7ad0916e886722186f09da036ea7a398f363f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update submodules on '5.12' in qt5Qt Submodule Update Bot2018-10-0211-0/+0
| | | | | Change-Id: Idb32934a75413896c3a1ea64cd0a69a42d75e9f5 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.12' in qt5Qt Submodule Update Bot2018-10-012-0/+0
| | | | | Change-Id: I1705b1d1b99f4a547bcd6c0c7d17a65f61aea44a Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.12' in qt5Qt Submodule Update Bot2018-09-307-0/+0
| | | | | | Change-Id: Ib44fb3e8fa52ff72bbe7f92630635a5158a02ed2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update submodules on '5.12' in qt5Liang Qi2018-09-2818-0/+0
| | | | | | | Skip qtbase in this round. Change-Id: Ia649f87c2bc71d9e755b665ef9bc86e2f63f8d0d Reviewed-by: Liang Qi <liang.qi@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 04:17:32 +0000