aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Update submodules on 'dev' in qt5Qt Submodule Update Bot2019-01-075-0/+0
| | | | | | | | | | Change-Id: I47de211a3ba630daafd58fb4e8e1fcff382b4e75 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Fix .ci.local to .intra.qt.io in docker provisioningTony Sarajärvi2019-01-071-1/+1
| | | | | | | | | | Change-Id: I9de241e70a5dd15568619da6e4a19d54e76e5a4c Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | Provisioning: Enable support for printer testSimo Fält2019-01-071-0/+2
| | | | | | | | | | | | | | Task-number: QTQAINFRA-992 Change-Id: Ibf13b8df51e72b2885c85af7bb256c73ce5697ed Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* | Add qtsaferenderer extra targets for CoinTuomas Heimonen2019-01-071-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>
* | Update submodules on 'dev' in qt5Qt Submodule Update Bot2019-01-072-0/+0
| | | | | | | | | | Change-Id: I348d25b8c0a90d8b1bd6ff20e759bcedb05b3f6f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on 'dev' in qt5Qt Submodule Update Bot2019-01-056-0/+0
| | | | | | | | | | Change-Id: I934499413588606f3db7acf499f4f6da59f7941a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on 'dev' in qt5Qt Submodule Update Bot2019-01-042-0/+0
| | | | | | | | | | Change-Id: I4eb4a253bbf94463ea2743c81f34ed21df101b35 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on 'dev' in qt5Qt Submodule Update Bot2019-01-044-0/+0
| | | | | | | | | | Change-Id: Ie53a57b7b1da333cc5274c2071232f361e8cb2c8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Reduce the number of zypper invocationsFrederik Gladhorn2019-01-031-42/+21
| | | | | | | | | | Change-Id: Ibb1c76fc4786d19a921c31b0933746f9dfefcde8 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on 'dev' in qt5Qt Submodule Update Bot2019-01-033-0/+0
| | | | | | | | | | Change-Id: Id3bea223f49d19d801fa5ea880ce42e5312534e4 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on 'dev' in qt5Qt Submodule Update Bot2019-01-022-0/+0
| | | | | | | | | | Change-Id: I9da113cf7cd79ed9ba04b1a764644c7920951508 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devLiang Qi2019-01-0257-75/+602
|\| | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules coin/provisioning/common/linux/docker_testserver.sh coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh Done-With: Ryan Chu <ryan.chu@qt.io> Change-Id: I9bc3afcb50783a9f0f7718731d237de4be287cae
| * Update submodules on '5.12' in qt5Qt Submodule Update Bot2018-12-311-0/+0
| | | | | | | | | | Change-Id: Iafeef38423c165f29169adf499b554b78e1a6c60 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Fix .ci.local to .intra.qt.io in provisioning scriptsTony Sarajärvi2018-12-312-2/+2
| | | | | | | | | | Change-Id: I113095b337c3592757878fb919a0a18a60a8ce7e Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * Provisioning: Install ODBC for macOS 10.12 10.13Juha Karjalainen2018-12-313-0/+68
| | | | | | | | | | | | | | | | | | | | This script installs libiodbc from brew and adds it to CPLUS_INCLUDE_PATH and LIBRARY_PATH thus enabling configure to find it and thus enabling odbc support for qt build on macOS. Task-number: QTBUG-58956 Change-Id: I7f865800b580a87afcc480534da57ee546c74406 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * Provisioning: Install XCode 10.1Simo Fält2018-12-312-3/+3
| | | | | | | | | | | | Task-number: QTQAINFRA-2323 Change-Id: I8fa4e146b2da71fba641f982d8114a916df42fc7 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Update submodules on '5.12' in qt5Qt Submodule Update Bot2018-12-273-0/+0
| | | | | | | | | | Change-Id: I4b4259963187eeeb8a4914c5581f3b4c69d70aa5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '5.12' in qt5Qt Submodule Update Bot2018-12-251-0/+0
| | | | | | | | | | Change-Id: I252064eb22e7360fdaf31e97bca31da562af6d6f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '5.12' in qt5Qt Submodule Update Bot2018-12-254-0/+0
| | | | | | | | | | Change-Id: I211a94a83d207cbc522ba4256004c6d17caeeebd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '5.12' in qt5Qt Submodule Update Bot2018-12-238-0/+0
| | | | | | | | | | Change-Id: I16389902fc5c4ac89d3f287c1b31384a825f6b8e Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Merge remote-tracking branch 'origin/5.12.0' into 5.12Liang Qi2018-12-224-29/+18
| |\ | | | | | | | | | Change-Id: Ifb4277657a6f85e6a6d0ee62e54360b2cb1c0514
| | * 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 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 qt5Qt Submodule Update Bot2018-12-217-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I03d42c54ab6e4acc9f67612f5a9e34e691ee0192 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | | Update submodules on '5.12' in qt5Qt Submodule Update Bot2018-12-203-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I45912749fc6e25f25e1065b8f7a751d5713ee2c9 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Provisioning: Update install android sdk to version 28Juha Karjalainen2018-12-183-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QT needs at least buildSdk 24 after commit 70057dfc0e53b7996acd5ef2c0f9c40aa3f66062. Updating provisioned sdk version to 28. Please note minSDK <= targetSDK <= build/compileSDK. Task-number: QTQAINFRA-2412 Change-Id: I0bf67cf42dfc6f707bdeae973a60c6601d2e73c3 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on '5.12' in qt5Qt Submodule Update Bot2018-12-183-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Icca1ee8d9b84ca8766e2b6a774098f936970b3ab Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Provisioning: Hide squish installation output from provisioning logHeikki Halmet2018-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This will prevent the output of unwanted information Change-Id: I547e91ef344ec51f799b26f254139b03d20a315c Reviewed-by: Simo Fält <simo.falt@qt.io>
| * | | Update submodules on '5.12' in qt5Liang Qi2018-12-1410-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip qtdeclarative in this round due to QTBUG-72527. Change-Id: I97aa9c1f472e88b3339dc39d841a5ef324b6fd90 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Merge remote-tracking branch 'origin/5.11' into 5.12Liang Qi2018-12-120-0/+0
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I262b06902381426b304d815265662a315e217c0a
| | * | | Update submodules on '5.11' in qt55.11Qt Submodule Update Bot2018-12-1037-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I72f653e9bdbece531d9d8d053e80d547a5ad56d5 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | | Merge remote-tracking branch 'origin/5.11.3' into 5.11Liang Qi2018-12-094-10/+10
| | |\ \ \ | | | | | | | | | | | | | | | | | | Change-Id: Iaa9c11ed5435e297e87b225060ea892bdb18deef
| | | * | | Provisioning: Update openssl to version 1.0.2pv5.11.3Juha Karjalainen2018-11-274-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-2266 Change-Id: I3f09d9169f17bcd83dcfd72547440bca487fd9db Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit 3b4ca5d6c0b44e64efd3776327b4f6714d0d8969) Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| | | * | | Update submodules on '5.11.3' in qt5Qt Submodule Update Bot2018-11-279-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I57a880017b682818a6ff0d8d6aaca204a5a7e87f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | * | | Update submodules on '5.11.3' in qt5Qt Submodule Update Bot2018-11-2131-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I82d312c03bf12d9afe81316aad9a41bd4c4859e3 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | | * | | Update submodules on '5.11.3' in qt5Qt Submodule Update Bot2018-11-131-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie32ea1823a1e4d33d4077db3c5d856b3ea216d90 Reviewed-by: Liang Qi <liang.qi@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 17:40:03 +0000