aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update submodules on 'dev' in qt5Liang Qi2016-10-0131-0/+0
| | | | | Change-Id: Id24be2272e6fe7256c6f96c1c54c2baf933f793f Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-3018-8/+347
|\ | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: I6f517c976152f2da390c556c7c9da08aaec4be90
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-3010-1/+119
| |\ | | | | | | | | | Change-Id: I4060b0ddeb5a77c40b31e1ce1dafd2e878b48e12
| | * Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2016-09-281-1/+1
| | |\ | | | | | | | | | | | | Change-Id: Ibf285f0d67fc5125c1c7da6dfc5b62b834d34867
| | | * 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>
| | * | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-09-284-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Id084a6f6a3ce4109beb1f36088afe2914ffa7735 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | * | Changed slash direction in CI_CONAN_BUILDINFO_DIRKonstantin Tokarev2016-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I13bea231301f12a3992abc11119fc34543e75ab2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-09-251-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I10f0169fa184c4f0c297af4b8f8795a711d88e58 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-09-2510-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I2a5733b235e381990aa51c87af3d69fa2582541f Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-09-237-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I0471e3be4be3b6109fe2afab79ba26915eede933 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | * | Update submodules on '5.7' in qt5Liang Qi2016-09-2029-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibdccfa62d894d5e2b3a72bf09d72b4c9c7ff1981 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Fixed value of CI_CONAN_BUILDINFO_DIR variable when provisioning WindowsKonstantin Tokarev2016-09-183-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I841783122edf82739826cc0a7672d8c809870e97 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Do not use qmake and cmake generator automatically for each conanfileKonstantin Tokarev2016-09-173-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep conanfiles self-contained. "txt" generator is not going to be used by coin internally, drop it. Task-number: QTQAINFRA-998 Change-Id: I80ffb7342e07d8ef883bed6de77ac9646479f145 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Added cmake_installer, imports and explicit library types to conanfilesKonstantin Tokarev2016-09-172-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-997 Change-Id: I70b51a47c12928944d9f48be13332fce12296af1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Changed BuildinfoDir of conan to use Coin-compatible compiler nameKonstantin Tokarev2016-09-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-998 Change-Id: Ica31bf88055cb46eb9b6a0438ba5df461b6c8e5f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Install conan dependencies if there is conanfile.txt for moduleKonstantin Tokarev2016-09-143-0/+40
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie331331f6383444c4329e7a57cb8a8b25e58bd2f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Added conanfiles for qtwebkitKonstantin Tokarev2016-09-142-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-997 Change-Id: I7aadf3549affeeeb3130d8fdb9ff15242a36aeb9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Install Conan on Win10Konstantin Tokarev2016-09-143-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtWebKit will use Conan to install 3rd party dependencies like ICU. Task-number: QTQAINFRA-997 Change-Id: I4b9bfeb86b28abfdef52afcf249428c3ec41f32a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Update Ruby on Win10Konstantin Tokarev2016-09-144-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtWebKit requires newer Ruby than version installed on Windows 10 builders. Task-number: QTQAINFRA-997 Change-Id: Id4f917a824daaab4aeb1445a3a16906663208b6d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | COIN Provisioning: Install ICU to RHEL 7.2Simo Fält2016-09-281-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9d99c9e8a10b89f430fd6a07932b9330cfb49726 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | COIN Provisioning: Disable selinux in rhel 7.2Simo Fält2016-09-281-0/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: I03c2b70e4c05440c6cf1a6d355f5800c67f62bb7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update submodules on '5.8' in qt5Qt Submodule Update Bot2016-09-2812-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia2e717ea4f71a3032146f3fc8b98f96d141f1f92 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | | Update submodules on '5.8' in qt5Qt Submodule Update Bot2016-09-2512-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Iec230ba54c75039fe1b0506540e52a598fff2510 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on '5.8' in qt5Qt Submodule Update Bot2016-09-245-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie862b6f2ec78e6c24f8f5bd0ee959e598f3d33d8 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on '5.8' in qt5Qt Submodule Update Bot2016-09-2212-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic9386ba7ad3b9a28180719440af6eeb64f4483ff Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Provision libusb-1.0 for LinuxKari Oikarinen2016-09-213-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It is a dependency of tqtc-boot2qt/qdb, which will join CI soon. Change-Id: I3b205877e705f554202ab7171f9d828491b95ac6 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * | | Update submodules on '5.8' in qt5Qt Submodule Update Bot2016-09-2030-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic49edc7055336d6717fdd985798f665db3803384 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Make sure to install gtk 3 and gstreamer on RHEL 7Frederik Gladhorn2016-09-151-0/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I95c570431c5b78e24754b6e08be0172071da3c51 Reviewed-by: Simo Fält <simo.falt@theqtcompany.com>
| * | | Update submodules on '5.8' in qt5Qt Submodule Update Bot2016-09-1518-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibe4e45b892e4e1caae53808b916bc13630ab88f9 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | automatically launch new configure system in top-level buildsOswald Buddenhagen2016-09-152-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this includes moving the -skip option here, where it belongs. the implementation is a bit hacky, but the proper one would be vastly more complex: we'd have to load all modules, then parse the command line properly (the -skip parsing would be a custom callback, to avoid needing to process features), then discard all now excluded modules again, then re-process the command line (so we can complain about options which are now invalid), and only now proceed with the actual feature processing. that seems a bit over the top, so we accept that -skip cannot be the argument of another option, which seems quite reasonable. Change-Id: I0053658e6d7e11b82cdfe55893cb553b664a9298 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-131-0/+101
| |\| | | | | | | | | | | | | | Change-Id: I62235fec5e9b8b81e41d64bfcf58067dc1213d0c
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-121-0/+101
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh Change-Id: Ib972234bb644353db6920b2dcbe1fd4775ef1779
| | | * 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>
| | | * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-08-1610-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I3fbdb4edc4d37a8b25fdaff52853d672c951891d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | | * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-08-1312-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I4821c386e318139e13ad228983c43c1b1d978494 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | | * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-08-1012-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I166e0f9a092f7e293d50d7efb12df54bcee5ec13 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-09-077-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic053fa3b81c674e4a63419bdab848e362b2a93a6 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-09-0313-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I8309b4fd697efb7b539c84d0c351b25c230a4950 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | * | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-08-2614-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I726579f7e3e25774dc882c1c9d4780ccf23deaed Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | fix branches of qtpim and qtsystemsOswald Buddenhagen2016-08-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | these repos were definitely _not_ branched for 5.7. Change-Id: Ib31d4e07f2651cfba0a7d31a9db1f1a812061313 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 22:18:26 +0000