lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-06 08:18:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,592 Commits 118 Branches 270 Tags
d1601aa0f94de81fe6b1651a2a3f5ce0a52a1ed3
Commit Graph

4592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Liang Qi
891afe7066 Update submodules on '5.7' in qt5 
Change-Id: Ibdccfa62d894d5e2b3a72bf09d72b4c9c7ff1981
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-09-20 20:47:42 +00:00
Qt Submodule Update Bot
2d61b0871d Update submodules on '5.8' in qt5 
Change-Id: Ic49edc7055336d6717fdd985798f665db3803384
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-09-20 20:47:04 +00:00
Qt Submodule Update Bot
6a8a0abf9e Update submodules on '5.6' in qt5 
Change-Id: Id7fba5c79f44c2081ed49ce8f7050b8eacfb76ef
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-09-18 09:07:30 +00:00
Konstantin Tokarev
23d1112839 Fixed value of CI_CONAN_BUILDINFO_DIR variable when provisioning Windows 
Change-Id: I841783122edf82739826cc0a7672d8c809870e97
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2016-09-18 05:57:54 +00:00
Konstantin Tokarev
e1bfa77391 Do not use qmake and cmake generator automatically for each conanfile 
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>
 2016-09-17 11:06:44 +00:00
Konstantin Tokarev
fd6fe04cad Added cmake_installer, imports and explicit library types to conanfiles 
Task-number: QTQAINFRA-997
Change-Id: I70b51a47c12928944d9f48be13332fce12296af1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2016-09-17 11:06:40 +00:00
Konstantin Tokarev
0958cc4cca Changed BuildinfoDir of conan to use Coin-compatible compiler name 
Task-number: QTQAINFRA-998
Change-Id: Ica31bf88055cb46eb9b6a0438ba5df461b6c8e5f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2016-09-17 11:06:35 +00:00
Qt Submodule Update Bot
efc461a174 Update submodules on '5.6.2' in qt5 
Change-Id: I623adf43a36ff5cd8de844ae533063523efe2b02
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2016-09-16 18:30:36 +00:00
Frederik Gladhorn
b5944e9485 Make sure to install gtk 3 and gstreamer on RHEL 7 
Change-Id: I95c570431c5b78e24754b6e08be0172071da3c51
Reviewed-by: Simo Fält <simo.falt@theqtcompany.com>
 2016-09-15 09:47:32 +00:00
Qt Submodule Update Bot
387e428e9a Update submodules on '5.8' in qt5 
Change-Id: Ibe4e45b892e4e1caae53808b916bc13630ab88f9
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-09-15 09:47:18 +00:00
Oswald Buddenhagen
64cc947ded automatically launch new configure system in top-level builds 
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>
 2016-09-15 06:52:35 +00:00
Konstantin Tokarev
78a764ee65 Install conan dependencies if there is conanfile.txt for module 
Change-Id: Ie331331f6383444c4329e7a57cb8a8b25e58bd2f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2016-09-14 22:31:17 +00:00
Konstantin Tokarev
b6414f7d08 Added conanfiles for qtwebkit 
Task-number: QTQAINFRA-997
Change-Id: I7aadf3549affeeeb3130d8fdb9ff15242a36aeb9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2016-09-14 22:31:11 +00:00
Konstantin Tokarev
99ff42545f Install Conan on Win10 
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>
 2016-09-14 22:31:01 +00:00
Konstantin Tokarev
90f5a25c66 Update Ruby on Win10 
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>
 2016-09-14 22:30:52 +00:00
Qt Submodule Update Bot
8cdb619bce Update submodules on '5.6' in qt5 
Change-Id: Id80b5734e19aa6f15d90b11abef9f9c183290292
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-09-13 18:02:05 +00:00
Eskil Abrahamsen Blomfeldt
25b385764e Add Qt Android Extras as dependency for Qt Purchasing 
Change-Id: Ia7b9d966777470642e0ee0ad3e9c82496ce93950
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
 2016-09-13 10:28:43 +00:00
Liang Qi
3e5229c689 Merge remote-tracking branch 'origin/5.7' into 5.8 
Change-Id: I62235fec5e9b8b81e41d64bfcf58067dc1213d0c
 2016-09-13 12:14:43 +02:00
Liang Qi
4477c49291 Merge remote-tracking branch 'origin/5.6' into 5.7 
Conflicts:
	coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh

Change-Id: Ib972234bb644353db6920b2dcbe1fd4775ef1779
 2016-09-12 15:09:56 +02:00
Heikki Halmet
f1de674fd9 Android sdk and ndk to provisioning for qt5.6 
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>
 2016-09-12 09:47:22 +00:00
Qt Submodule Update Bot
1c06b83ff0 Update submodules on '5.8' in qt5 
Change-Id: I4bd1038cd3ee8cefcfb27179527511c41a0af799
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-09-08 04:27:50 +00:00
Qt Submodule Update Bot
33feec0dc8 Update submodules on '5.7' in qt5 
Change-Id: Ic053fa3b81c674e4a63419bdab848e362b2a93a6
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-09-07 04:20:09 +00:00
Qt Submodule Update Bot
2fb27862aa Update submodules on 'dev' in qt5 
Change-Id: I4e7a32798c5b37f63776f8c8ee5e21e9d198895f
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-09-06 17:14:38 +00:00
Qt Submodule Update Bot
25ee5c337c Update submodules on '5.6' in qt5 
Change-Id: I1f0e77afca353b07420ed8da001cfbbaaa738dce
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-09-06 05:13:43 +00:00
Qt Submodule Update Bot
4faee20713 Update submodules on '5.6.2' in qt5 
Change-Id: Ie03202844e195a89cb536fde6b3c357929737cf8
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2016-09-05 16:47:08 +00:00
Qt Submodule Update Bot
72c617cf91 Update submodules on '5.8' in qt5 
Change-Id: Ic507adbb59d9a95afa4c188223f8e0a5d2d5d03c
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-09-05 04:38:30 +00:00
Qt Submodule Update Bot
cb6b46a516 Update submodules on '5.6' in qt5 
Change-Id: I34bab96a9ec73aa07e1295250aa85528f306a679
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-09-04 15:16:38 +00:00
Qt Submodule Update Bot
64f62b4b95 Update submodules on '5.7' in qt5 
Change-Id: I8309b4fd697efb7b539c84d0c351b25c230a4950
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-09-03 23:30:51 +00:00
Qt Submodule Update Bot
68a5a649ab Update submodules on '5.6' in qt5 
Change-Id: I565078e5d2d1d8b6a9111d3f063eaebafe008c6f
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-09-02 18:06:20 +00:00
Qt Submodule Update Bot
5b7def1433 Update submodules on '5.8' in qt5 
Change-Id: I457d16bb5c82d98dfc0995e84c08fee89d872e89
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
v5.8.0-alpha1 		2016-09-01 03:23:21 +00:00
Qt Submodule Update Bot
66ffe13b50 Update submodules on '5.6' in qt5 
Change-Id: I45ed20f8f12335ac2d7aa315329a25c8fbac94fa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-08-30 04:00:57 +00:00
Qt Submodule Update Bot
70361aac02 Update submodules on '5.8' in qt5 
Change-Id: I165c8b4ae2709d009462b7fa5b91561759524e5f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2016-08-29 04:29:14 +00:00
Qt Submodule Update Bot
85771ddaaa Update submodules on '5.8' in qt5 
Change-Id: I558721d2b7a630453ce794e7b7b97e1fca5ef3dc
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2016-08-28 17:43:30 +00:00
Simon Hausmann
31d8277404 Remove qtsystems from the list of recommended modules in qtlocation 
QtSystems is not a supported module at the moment, and the code in
QtLocation to utilize QtSystems is behind an #ifdef and destined for
removal.

Change-Id: Ide44f138638ccd751044c13c289f1e116641a23e
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
 2016-08-28 17:43:26 +00:00
Qt Submodule Update Bot
42ed864856 Update submodules on '5.7' in qt5 
Change-Id: I726579f7e3e25774dc882c1c9d4780ccf23deaed
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-08-26 19:04:36 +00:00
Qt Submodule Update Bot
7831d61e82 Update submodules on '5.8' in qt5 
Change-Id: I188c217abff06c901f6da7561bc7ed1f3c12d8b1
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
 2016-08-24 18:02:48 +00:00
Jani Heikkinen
56fc6bc77b Removed TP status from qtscxml and qtserialbus 
Change-Id: I8ed4edcdf9eab48ec1ac278d3e8de38149b0fd8d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
 2016-08-24 18:02:44 +00:00
Oswald Buddenhagen
71524c78f6 Merge remote-tracking branch 'origin/dev' into 5.8 
Note that this also contains the adjustment of the branch for the
latecomers qtspeech and qtnetworkauth.

Change-Id: Ia77eb4d47a6ad66cb35e50ae03af751f46a805a8
 2016-08-24 19:54:10 +02:00
Oswald Buddenhagen
9584900b5c Adjust submodule branches 
Change-Id: Ibc4de8e8a06cf2391ae33be2d02fc21f4e3ab70f
 2016-08-24 11:52:19 +02:00
Qt Submodule Update Bot
2dcb31a181 Update submodules on '5.6' in qt5 
Change-Id: I1104beac8bafb324731879efdb752a1cebbb9512
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-08-22 16:37:59 +00:00
Jesus Fernandez
b78f3579af Add qtnetworkauth 
Change-Id: I4cd81725d0aec29ff3252a84504a81a44d1b60eb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
 2016-08-22 09:03:20 +00:00
Oswald Buddenhagen
6cfd3a2118 fix branches of qtpim and qtsystems 
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>
 2016-08-18 04:29:08 +00:00
Qt Submodule Update Bot
af364a39aa Update submodules on '5.7' in qt5 
Change-Id: I8b849ebf5685a65206d1c60d1c3f7b85e3e6716d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-08-18 04:28:57 +00:00
Frederik Gladhorn
80ee813a03 Make QtSpeech a tech preview release for Qt 5.8 
Change-Id: I144109a45bece4b2283c24ad7aae64c098f86963
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
 2016-08-17 08:37:40 +00:00
Qt Submodule Update Bot
9410b99b16 Update submodules on 'dev' in qt5 
Change-Id: Ie425f3f5a64e83702a6987d2892fbfa68bea5844
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-08-17 07:26:42 +00:00
Qt Submodule Update Bot
2556777f36 Update submodules on '5.6' in qt5 
Change-Id: I3fbdb4edc4d37a8b25fdaff52853d672c951891d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-08-16 11:53:15 +00:00
Qt Submodule Update Bot
2ed6386fe3 Update submodules on '5.6' in qt5 
Change-Id: I4821c386e318139e13ad228983c43c1b1d978494
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-08-13 10:06:10 +00:00
Qt Submodule Update Bot
40e137cbee Update submodules on '5.7' in qt5 
Change-Id: I5494d36a2b93a85acbc5825f5bd73d032a4098a9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-08-11 23:30:46 +00:00
Qt Submodule Update Bot
b0bfbf3bf0 Update submodules on '5.6' in qt5 
Change-Id: I166e0f9a092f7e293d50d7efb12df54bcee5ec13
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-08-10 12:05:33 +00:00
Oswald Buddenhagen
7efeb26af7 Adjust submodule branches 
Change-Id: I6e8c8e91b7e17efa93b24e8026fa3f340bd10e9d
 2016-08-08 11:06:22 +02:00