aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Improve disabling of screensaver on macOSSimon Hausmann2016-12-084-4/+96
| | | | | | | | | | Setting the idleTime on currentHost works well, until the hardware UUID changes and thus the host ID for the setting. With kvm that happens quite frequently, with vmware less but also occasionally (deep clone for example). By disabling the screensaver on start-up we can cover all cases quite easily. Change-Id: Ibdcf404430656f9caa47386ca3c732366ddfc8c7 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Suppress shutdown indicator in UbuntuJędrzej Nowacki2016-12-074-0/+12
| | | | | | | | | We want to quit machines without being asked, if we are really sure. Change-Id: Ic7156f5b0fe236c0270d8c2e4fcc322a82776caf Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Disable the screensaver on macOS definitely and permanentlySimon Hausmann2016-12-074-0/+12
| | | | | | Change-Id: I8856eebfe91b9e1cc2cc318a1e7ea80348f1486e Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Fix paths for provisioning on macOSSimon Hausmann2016-12-074-0/+0
| | | | | | | | | The directory names were missing the architecture, otherwise the content was unused. Change-Id: I0316da5c4b1352012f27ce330c3319a8aedf01ea Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Fix macOS provisioning not shutting down cleanlyFrederik Gladhorn2016-12-074-0/+34
| | | | | | | | | | | | | After provisioning we want the machine to be sensibly shut down since we will use the disk image later. VSphere doesn't manage to shut down 10.8 VMs. Help out by calling shutdown. For the other OS X/macOS versions, this is also desirable since controlling the power state of these machines is hard with different virtualization solutions (we're looking at OpenNebula/KVM). Change-Id: Ieabc14f9c8c1af9421a0ef91dd670f4790a84461 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* don't fail to check out some modules in pinned modeOswald Buddenhagen2016-11-301-1/+8
| | | | | | | | | | | | | | | when used without the --branch option, we clone with --no-checkout, to avoid unnecessarily checking out files twice when the recorded sha1 doesn't happen to be the tip of the default branch. however, that would leave the index in a dirty state which would make the subsequent submodule update abort at some point, silently. to deal with the problem, we ignore this type of index dirtyness and use submodule update with --force. Task-number: QTBUG-57289 Change-Id: I6fc9693b0eaadfb04d2d80f9c8f1f2e11be47ae9 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* refuse to operate with dirty submodulesOswald Buddenhagen2016-11-301-0/+28
| | | | | | | | the operation would later error out anyway, after spending a lot of time fetching the remotes, and leaving a partially updated state behind. Change-Id: Ib2a688e446a9bd4ba3b15fc73082224433c18388 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Update submodules on '5.6' in qt5Liang Qi2016-11-3035-0/+0
| | | | | Change-Id: I88a559589ffd21c7436df6c644c92db21244860d Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Liang Qi2016-11-262-0/+0
| | | | | Change-Id: Id212d3e785bef2ca0aa0d9fad3b7933369626643 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Add basic Ubuntu 16.04 provisioningFrederik Gladhorn2016-11-252-0/+48
| | | | | Change-Id: Iaae5bb295bfd48cc5bc036baef9b0fa899d393ef Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on '5.6' in qt5Liang Qi2016-11-2510-0/+0
| | | | | Change-Id: I65e6b60cdc03f25d050854c68220fa96ee140bf6 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Liang Qi2016-11-234-0/+0
| | | | | Change-Id: I885a6ee78c480bda7f325a21d73d3f95863f9ad4 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Provision OPENSSL env variable for openSUSE 13.1Tony Sarajärvi2016-11-221-0/+38
| | | | | | | | | | | | Fix building on OpenSuse after openssl update. Every linux distro seems to patch openssl in a different way to deal with broken/outdated SSL issues. We seem unable to detect what suse did when running configure, so this is a stop-gap measure. Change-Id: I5e375e9c5c1615358dbce0b8dd91476cb4f4e45b Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on '5.6' in qt5Liang Qi2016-11-225-0/+0
| | | | | Change-Id: I73b32ee6ef5a643c78bb297230fb675a5a3dd64f Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Liang Qi2016-11-185-0/+0
| | | | | Change-Id: I6635f499760dbd4b58e0c65150c886b64ece8391 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-11-165-0/+0
| | | | | Change-Id: Ieda66165e735256fa25f335804f54d3574bdcd25 Reviewed-by: Liang Qi <liang.qi@qt.io>
* produce less ugly paths to the commit template in submodulesOswald Buddenhagen2016-11-141-1/+1
| | | | | | Change-Id: I7ebf3c46088e193c8f4605532c1f4a1b6d62d230 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* add --no-fetch optionOswald Buddenhagen2016-11-141-4/+12
| | | | | | | | | there is no point in re-fetching all repositories just because an update failed due to local modifications. Change-Id: Ie9883586d77f3310058353844f0bbcfb0b775ebb Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-11-1133-0/+0
| | | | | Change-Id: Ib475bf7c1fcab721cc884313a6c9dd1426a46ad6 Reviewed-by: Liang Qi <liang.qi@qt.io>
* fix cloning of tagged versionsOswald Buddenhagen2016-11-041-2/+7
| | | | | | | | | | | | | | | | the .gitmodules of tagged commits typically refers to a release branch which was deleted shortly after the release. consequently, git clone --branch is bound to fail. of course, cloning a fixed sha1/tag requires no branch in the first place, so revert back to using git clone --no-checkout in that case. amends ac6168c0c. Task-number: QTBUG-49133 Change-Id: Ica032f1d07a70ad89f16b23bdf5cdab785612fdc Reviewed-by: Robert Loehning <robert.loehning@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-11-044-0/+0
| | | | | Change-Id: Ic9d3ad8264dfc543f8bac4bda81b82c7f92fe176 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-11-039-0/+0
| | | | | Change-Id: I3f4f3b15e3528c319c1479759282571759477faf Reviewed-by: Liang Qi <liang.qi@qt.io>
* Clean up usage of qtsvg as dependencyFrederik Gladhorn2016-11-021-3/+3
| | | | | | | | | | | | There is no build dependency on QtSvg in qtdeclarative or qtquick1, so don't recommend it for builds. QtSensors on the other hand has an example that does need svg. This does not change anything in the big picture, the svg module will be built as always and svg files will be displayed. The change is the ordering of builds (leave more room for parallelization). Change-Id: I50e527e03a75742036d5f914611d0b34437a8e3a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-312-0/+0
| | | | | Change-Id: Ib4bc5819e056a5571967aa9919d5a092834c28a7 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-296-0/+0
| | | | | Change-Id: I4ef33095de23bbf2878f796e036ad6fd5e7d69df Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-279-0/+0
| | | | | Change-Id: I4ecaec417836737c4d428dbfe69261666d1330eb Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-2212-0/+0
| | | | | Change-Id: Iefe7bd1ea3f99dee7503a8ae2bc62ce965121029 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-144-0/+0
| | | | | Change-Id: Id6ff55fb87154f79a136784c5fe4f63711183fa4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-114-0/+0
| | | | | Change-Id: I62cae7b521df5e7c9073c3361017a74d3355a1e0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-091-0/+0
| | | | | Change-Id: Iefa745df986d2794dfdcb7454733122334d5192c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-0815-0/+0
| | | | | Change-Id: I186da5a92032e37abcfbaa96e393f2dd2304d181 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.6.2' into 5.6Liang Qi2016-09-300-0/+0
|\ | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: Ifffec3df90687a6ad84547bb0f603b0446bf0e9d
| * Update submodules on '5.6.2' in qt5v5.6.2Qt Submodule Update Bot2016-09-252-0/+0
| | | | | | | | | | Change-Id: I337a9d4897efe57d3ac09d9981bb2b07f96a9d87 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update submodules on '5.6.2' in qt5Qt Submodule Update Bot2016-09-232-0/+0
| | | | | | | | | | Change-Id: I47372eb19e0f038e1ec1999a183125ed1c5300c7 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update submodules on '5.6.2' in qt5Qt Submodule Update Bot2016-09-1616-0/+0
| | | | | | | | | | Change-Id: I623adf43a36ff5cd8de844ae533063523efe2b02 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update submodules on '5.6.2' in qt5Qt Submodule Update Bot2016-09-0516-0/+0
| | | | | | | | | | Change-Id: Ie03202844e195a89cb536fde6b3c357929737cf8 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Adjust submodule branchesOswald Buddenhagen2016-08-241-34/+34
| | | | | | | | Change-Id: Ibc4de8e8a06cf2391ae33be2d02fc21f4e3ab70f
* | Python to provisioning for WindowsHeikki Halmet2016-09-3013-0/+164
| | | | | | | | | | | | | | | | | | Installs Python version 2.7.10. Python is required for building Qt 5 from source. More specifically qtdeclarative and qtwebkit require it. Change-Id: I63c8f3294a8a4799df5e52fbd41a36db8686950e Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-09-273-0/+0
| | | | | | | | | | Change-Id: I76cd6f71dd61e2478b73d39163e7fbe4b8f6afe6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-09-241-0/+0
| | | | | | | | | | Change-Id: Ifa9a8c1e59cf8e286c4a52b6936720da76f92073 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-09-249-0/+0
| | | | | | | | | | Change-Id: I66d3689ab56b1b8b1c754ced12456ff7e86052f7 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-09-1819-0/+0
| | | | | | | | | | Change-Id: Id7fba5c79f44c2081ed49ce8f7050b8eacfb76ef Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-09-136-0/+0
| | | | | | | | | | Change-Id: Id80b5734e19aa6f15d90b11abef9f9c183290292 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Add Qt Android Extras as dependency for Qt PurchasingEskil Abrahamsen Blomfeldt2016-09-131-1/+1
| | | | | | | | | | Change-Id: Ia7b9d966777470642e0ee0ad3e9c82496ce93950 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* | Android sdk and ndk to provisioning for qt5.6Heikki Halmet2016-09-121-0/+105
| | | | | | | | | | | | | | | | | | | | | | | | Install latest Android sdk and ndk. It also runs update for SDK API level 18, latest SDK- and platform- tools and build-tools version 23.0.3. Build-tools version 23.0.3 is the latest usable version for Red Hat 6. Newer version of build-tools, version 24.x.x, requires GLIBC_2.14, which is not available in Red Hat 6. Change-Id: Iddc353674a65e0af7a9036d9296b9c2933fa114f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-09-069-0/+0
| | | | | | | | | | | | Change-Id: I1f0e77afca353b07420ed8da001cfbbaaa738dce Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-09-042-0/+0
| | | | | | | | | | Change-Id: I34bab96a9ec73aa07e1295250aa85528f306a679 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-09-028-0/+0
| | | | | | | | | | Change-Id: I565078e5d2d1d8b6a9111d3f063eaebafe008c6f Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-08-3013-0/+0
|/ | | | | Change-Id: I45ed20f8f12335ac2d7aa315329a25c8fbac94fa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-08-2213-0/+0
| | | | | Change-Id: I1104beac8bafb324731879efdb752a1cebbb9512 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>