aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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>
| | * | | | Update submodules on '5.11.3' in qt5Qt Submodule Update Bot2018-11-111-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If25a7c3df9d53ff3bd84b75a1dd775e5ab9cd35f Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | | | Update submodules on '5.11.3' in qt5Qt Submodule Update Bot2018-11-0939-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibf09137346dd0aef4f3dc0a784ad9f4c450f068a Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | | | Adjust submodule branchesOswald Buddenhagen2018-11-021-40/+40
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iae1035a9633243bc39e86a6e9133a1263b40a750
| * | | | | Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-12-041-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I07f616fb66b4b3e0f2a5a216c9fe56c0a0f42d6e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * | | | | Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-12-013-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idbb6f72e0092d564d76c81f41470e5d687864a00 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * | | | | Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-11-301-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7f6500a82a0967a0adafe719647f40013457a2a5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * | | | | Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-11-295-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I809770ab61b7f7544f96b218f89f55c66360e7b8 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | | | Update submodules on '5.12' in qt5Qt Submodule Update Bot2018-12-1240-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib45df166b0096ec1ec198e6cba792cd8a41c05a7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | | | Add configuration to run qtconnectivity tests on winrtOliver Wolff2018-12-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib9b61b19033d4ceb7ce15ecc8c1a0227b53bb669 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | | | Provisioning: Change how executables are waited to finishJuha Karjalainen2018-12-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch only affects Windows. Python3 provisioning took over 30-35 minutes. As both 32 and 64 bit versions are provisioned it took over 1h this change lowers time taken to 5 minutes. start-process with -wait flag waits for given process and its sub-processes to exit. Wait-process insteads just waits for process to exit. Change-Id: Ib9a323dcf9e2d07318a0d259a72ca4c4d0a4ed80 Reviewed-by: Simo Fält <simo.falt@qt.io>
* | | | | | Provisioning: Windows 10 32bit remote desktop access allowJuha Karjalainen2018-12-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow accessing windows remote desktop. Task-number: QTBUG-71874 Change-Id: I70c0acc309bd5e2bc590e7cd35a918ca7940fd03 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | | | | | Provisioning: Add missing prefix for yocto_ssh_configurationsHeikki Halmet2018-12-121-0/+0
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1a49737188cff6291b16797293a221043bdddad1 Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | | | | Update submodules on '5.12' in qt5Qt Submodule Update Bot2018-12-037-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibd42172f2b956c18c692bf125390554e5868a438 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | | Update submodules on '5.12' in qt5Qt Submodule Update Bot2018-11-2911-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id7db93fe860bd6986e4565c91fa03674306b7b88 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | | | Don't set http_proxy in its own subshellTony Sarajärvi2018-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The subshell actually meant, that the http_proxy environment variable was never seen outside that check. Thus proxy was never used where this was checked. Change-Id: I069f43f13dffca98d8b60a47c2e105209018c84d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | | | | provisioning: RHEL-7.4 install xcb-util-* packagesGatis Paeglis2018-11-291-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do install them on Ubuntu and openSUSE. Eventually we want to stop using bundled xcb libraries. Currently all builds of Qt on Linux use -qt-xcb switch (see coin/src/targetenvironments.py::LinuxTargetEnvironment), which is the reason why things build fine, even when packages are not present on the system. Change-Id: I856ddb5a17768b347aec3e593d6b969109a5c3a3 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* | | | | provisioning: consistently install libxkbcommon* on linux distrosGatis Paeglis2018-11-292-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ubuntu was the only distro that installed both of the required packages: installPackages+=(libxkbcommon-dev) installPackages+=(libxkbcommon-x11-dev) RHEL 7.4 did not explicitly install any, but got libxkbcommon-dev pulled in as gtk3 dependency. Extract from provisioning log: --> Processing Dependency: pkgconfig(xkbcommon) >= 0.2.0 for package: gtk3-devel-3.22.30-3.el7.x86_64 ---> Package libxkbcommon-devel.x86_64 0:0.7.1-1.el7 will be installed openSUSE explicitly installed libxkbcommon-devel, but not libxkbcommon-x11-devel. Qt official binaries are built on RHEL, where we do not have libxkbcommon-x11-dev installed. This means that XCB plugin and Compose input plugin would fallback to using bundled sources. It was actually desired until now that XCB/Compose use the bundled sources instead of linking with the library from the system, but this was only a lucky side effect. If we had installed libxkbcommon-x11-dev on RHEL, then Qt binaries would end up linking with the libxkbcommon from the system, because of the missing "-qt-xkbcommon" configre switch for release builds. We won't bundle libxkbcommon anymore, hence we need to install the missing dependencies, as done by this patch. Change-Id: I5c7b8ac38c266ce81cb5a3189a9082bfd581ee31 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* | | | | Update submodules on '5.12' in qt5Qt Submodule Update Bot2018-11-2910-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3641f84b3395cbb306be44e01beefceb776b2ed5 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | | Update submodules on '5.12' in qt5Qt Submodule Update Bot2018-11-252-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I522ab6944a7d30421e8087c9406c383c004cf7a7 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-30 07:46:12 +0000