aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update submodules on '5.8.0' in qt5v5.8.0-rc1Qt Submodule Update Bot2016-12-201-0/+0
| | | | | Change-Id: I060ef5334c8d096c6167663b5c2dd8d45a5a2aec Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update submodules on '5.8.0' in qt5Qt Submodule Update Bot2016-12-191-0/+0
| | | | | Change-Id: Id31eaddee9fe5f64def0e4ddf3b81007c7fead16 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Update submodules on '5.8.0' in qt5Qt Submodule Update Bot2016-12-171-0/+0
| | | | | Change-Id: I2f0a28823f83b2980989b3070a6ee91e1957ee7e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on '5.8.0' in qt5Qt Submodule Update Bot2016-12-1617-0/+0
| | | | | Change-Id: Ic73b70eb3399c4d1a69e76e0a55896ced61423b6 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update submodules on '5.8.0' in qt5Qt Submodule Update Bot2016-12-114-0/+0
| | | | | Change-Id: I9dee754f6b2ea4be834a483012ec8e13fe72c8c8 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update submodules on '5.8.0' in qt5Qt Submodule Update Bot2016-12-106-0/+0
| | | | | Change-Id: I602ac700f615b32917a16cc368403978869b0c9a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update submodules on '5.8.0' in qt5Qt Submodule Update Bot2016-12-099-0/+0
| | | | | Change-Id: I288795ff5b32bb847d17f1ae9828bc1c83102e8b Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update submodules on '5.8.0' in qt5Qt Submodule Update Bot2016-12-0812-0/+0
| | | | | Change-Id: Ia2d83e159b8648958cb123045aabd254330287ea Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update submodules on '5.8.0' in qt5Qt Submodule Update Bot2016-12-0713-0/+0
| | | | | Change-Id: Ie42264d273d73c32f2763ed3c9dfa7dcb1ede5d6 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8.0Liang Qi2016-12-0246-78/+1592
|\ | | | | | | Change-Id: Ic9a6b04afe47529c4f953bace93e9c17d8c4d39d
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-12-014-1/+122
| |\ | | | | | | | | | Change-Id: Ib22c9e0f5c3e7c256ca083de33e6ad0475f20ce9
| | * 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>
| * | Copy conanfile to conanbuildinfos directoryKonstantin Tokarev2016-11-301-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conanfile is required for running "conan imports" as a part of "make install" procedure, however its original location is unknown to build system of module. Conanfile is copied with its conventional name "conanfile.txt" to avoid tying module build system to more qt5.git layout peculiarities. In future we may want to have several conanfiles in one provisioning dir, like qtwebkit-mingw.txt and qtwebkit-msvc.txt. Also simplified syntax of PowerShell variables interpolation, $() is needed only for interpolating expressions. Task-number: QTQAINFRA-998 Change-Id: I6904e80f4f85bb5269b0830272c6eaa2c8100789 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Updated conan to 0.16.0Konstantin Tokarev2016-11-304-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use --no-imports when installing packages, imports will be performed on "make install" step with new "conan imports" command. * Add txt generator to all conanfiles because it will be needed for "conan imports". Change-Id: Ie5e7ac6bfbf14dfa32ce82136b6be5e39476e393 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update submodules on '5.7' in qt5Liang Qi2016-11-262-0/+0
| | | | | | | | | | | | | | | Change-Id: I81e9785dce8bbbe6bada7d90732cda708c98d0a4 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update submodules on '5.7' in qt5Liang Qi2016-11-2533-0/+0
| | | | | | | | | | | | | | | Change-Id: I5bc3cdd755a3e29c936c1db7c51d0e1418be3a97 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update Ruby on Win7Konstantin Tokarev2016-11-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | QtWebKit requires newer Ruby than version installed on Windows 7 builders. Install the same version as is installed on Windows 10 builders. Task-number: QTQAINFRA-997 Change-Id: Id8e5d47028ef8403bb28daf1446d95dc8f2ab564 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Added conan zlib package for MinGW on Windows 7Konstantin Tokarev2016-11-233-0/+62
| | | | | | | | | | | | | | | Change-Id: I48d904e95fce905b15b0099fee956c06773c4a75 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update submodules on '5.7' in qt5Liang Qi2016-11-222-0/+0
| | | | | | | | | | | | | | | Change-Id: I96e1ca64b6c2f6d4abb318d8e55f865eb24d4465 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update submodules on '5.7' in qt5Liang Qi2016-11-201-0/+0
| | | | | | | | | | | | | | | Change-Id: Ibd8707fd3c3219d7777bb4a82cfbbbf31837e960 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | When installing Python ensure that pip is installed tooKonstantin Tokarev2016-11-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | If Python is not deinstalled cleanly (01-windows_removethemall.ps1 just erases installation directory) pip is not bootstrapped by new installation. Fix it by running ensurepip module. Change-Id: I3a7ed87eed30118876d7022eed94b8a571677529 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Use full paths for invoking stuff from Python27\ScriptsKonstantin Tokarev2016-11-181-2/+4
| | | | | | | | | | | | | | | Change-Id: I52094cc4b27b9e3a6fe3dd12c504777b8bb7bc75 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Fixed broken conan manifest in qtci-windows-7-x86Konstantin Tokarev2016-11-181-2/+2
| | | | | | | | | | | | | | | Change-Id: I5c88b0d6e8ee6d8599b800a713d65111fbb4ad2a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Provisioning should fail in case of conan errorsKonstantin Tokarev2016-11-181-2/+9
| | | | | | | | | | | | | | | Change-Id: I54ee86f5cf0f39cd7bafe71682b93a2a3c8fce5c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Rename conan.ps1 and python.ps1 file in configuration dirs tooKonstantin Tokarev2016-11-188-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Order of files really matters in configuration directories, but I renamed only main implementations in previous commit. Fixed that. Change-Id: Ia541fa8fd36b3d52580ba9814e9f4c38aadce460 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update submodules on '5.7' in qt5Liang Qi2016-11-185-0/+0
| | | | | | | | | | | | | | | Change-Id: I158e1550ffa19117258088b718dfaaa9d3f110df Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-172-10/+23
| |\| | | | | | | | | | Change-Id: I1c5420f9d0a192f55623b2d46aec7a15b7877609
| | * 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 08:55:46 +0000