aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Fix provisioning ODBC environmetal variables had : at endJuha Karjalainen2019-01-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CPLUS_INCLUDE_PATH and LIBRARY_PATH environmental variables had --> : <-- at end of variable. As this adds current dir to search path this is undesirable and causes bugs. Change-Id: Ia36c3f3f791f5d506eea15aba6be6d665049a922 Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | | Provisioning: Update Qt OpcUA backendsMaurice Kalinowski2019-01-098-455/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Unified Automation SDK needs to be updated to 1.6x to reflect latest API changes - Open62541 is now inside 3rdparty of the Qt OpcUA module. Hence, no need to provision it. Change-Id: I96a3764053ca684fa71f9d49e998ebe0ce45a6ae Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com> Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
* | | Prospective fix for git lfs installationSimon Hausmann2019-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keys used to sign package repositories tend to have expiry dates and therefore need to be changed from time to time. Therefore hardcoding the key we expect here will break (as it does right now) and it's better to retrieve the expected key via a secure transport. The old key - per http://keyserver.ubuntu.com/pks/lookup?search=0xC2E73424D59097AB&op=vindex - will expire on the 12 of January. That's probably why they changed the key used to sign the repo before the expiry. Change-Id: I39d082a6e12731b7eb0a8214a500101ca24f8af4 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | | Fix broken provisioning script DownloadURL.shJuha Karjalainen2019-01-091-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | DownloadURL returns 0 even when alt download fails. Task-number: QTQAINFRA-2501 Change-Id: Id2fb1e0b4ff12a48b6adb27291f55fc129296233 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-01-098-0/+0
| | | | | | | | | | | | | | | Change-Id: I438761719f8deceebfc4a77fb660a18c8d6ed00b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | Provision: install unixodbc-devel libraryJuha Karjalainen2019-01-081-0/+3
| |/ |/| | | | | | | | | | | | | Adds odbc support for rhel7. Task-number: QTBUG-72444 Change-Id: I49b1e91d9f87bdf98601627538aaa65b78440451 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-01-0840-0/+0
| | | | | | | | | | Change-Id: I68c69cdc9b74c52bc0729fc51144a8fdd9d783ec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-01-072-0/+0
| | | | | | | | | | Change-Id: I3ce524dab858e04fd2098385557893efbfa4c6ad Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-01-063-0/+0
| | | | | | | | | | Change-Id: I52940e20029c38b79e9f437395d5cf91c4f9f7d4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-01-045-0/+0
| | | | | | | | | | Change-Id: Iccf7bb925a120556c11db3396e67571c69ca9d68 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Provisioning: Add Squish Coco for RTAHeikki Halmet2019-01-044-0/+113
| | | | | | | | | | | | Task-number: QTQAINFRA-2393 Change-Id: I391a2670a46835988da6fd1d9121172c706c7a21 Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
* | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-01-036-0/+0
| | | | | | | | | | Change-Id: I8fea0b5ffaadbf5670fd2408b9f9c2e410c49cdb Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Upgrade macOS 10.12.3 to 10.12.6Tony Sarajärvi2019-01-033-5/+5
| | | | | | | | | | | | | | | | | | | | 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>
* | Provisioning: Unify duplicated openssl provisioning scriptJuha Karjalainen2019-01-033-144/+83
| | | | | | | | | | | | | | | | MacOS(10.12 and 10.13) had two identical provisioning scripts for openssl. Now unified under common. Change-Id: If469a56d431e72b291a810fa9c1b701873fe382d Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
* | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-01-034-0/+0
| | | | | | | | | | Change-Id: I77e2984900d563a6effb5e31c7f20654e5624b71 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Provisioning: Windows: Disable automatic defragmentationJoni Jäntti2019-01-027-0/+40
| | | | | | | | | | | | | | | | | | Automatic disk defragmentation is enabled by default on Windows machines. It should be disabled to save some time. Task-number: QTQAINFRA-2217 Change-Id: I3f024208bd35c9e305569e6b2b562f5a8b16f6f1 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 23:54:16 +0000