lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
864 Commits 118 Branches 270 Tags
dc199e37d59beb8a4801a599dd5a0ff9ee2c23f8
Commit Graph

864 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qt Submodule Update Bot
dc199e37d5 Updated submodules. 
Change-Id: Ife236cc44c61eab39bec31a5ac9c0647934b03af
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-02-17 20:44:41 +01:00
Qt Submodule Update Bot
fe236cc44c Updated submodules. 
Change-Id: I7befa702530b486531fbbc2ef7ed4d3195e2ad54
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-02-16 08:11:37 +01:00
Qt Submodule Update Bot
7befa70253 Updated submodules. 
Change-Id: I805c735b027c237245a0083a1d827bb9f64c21ce
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-02-15 17:12:38 +01:00
Qt Submodule Update Bot
805c735b02 Updated submodules. 
Change-Id: Ib25883ebaafe1b86077d77d5598355d1f9320a5a
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-02-13 10:31:05 +01:00
Oswald Buddenhagen
604f330cd2 don't unnecessarily confuse qt creator 
our CONFIG+=build_pass hack has the side effect that qmake does not emit
the calling command line to the makefile, which makes creator unable to
detect the build. so revert the hack as soon as it did its deed.

Task-number: QTBUG-34788
Change-Id: I4c0fd28d661ca5049f31d5405e84525efb12fd4e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2014-01-23 07:18:25 +01:00
Qt Submodule Update Bot
b25883ebaa Updated submodules. 
Change-Id: Ia968d5d5314ac04835e90be462b1a71f8ab293e9
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
 2014-01-20 18:37:41 +01:00
Qt Submodule Update Bot
a968d5d531 Updated submodules. 
Change-Id: I5fd794ca6d89ea5787cb1b7d2dcabc6f7b75776a
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-01-20 12:43:47 +01:00
Qt Submodule Update Bot
5fd794ca6d Updated submodules. 
Change-Id: Ic8d3a71d7cf7e92224064aa989a9551ee52c9d57
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-01-17 09:37:44 +01:00
Qt Submodule Update Bot
c8d3a71d7c Updated submodules. 
Change-Id: I402457bcfbad53c6dd2214290c668ece693bbdcd
Reviewed-by: Matti Paaso <matti.paaso@digia.com>
 2014-01-10 08:49:02 +01:00
Qt Submodule Update Bot
402457bcfb Updated submodules. 
Change-Id: I06d0fa240f6a0f99770e51969543608dbaf5f7e0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2014-01-09 18:00:53 +01:00
Qt Submodule Update Bot
06d0fa240f Updated submodules. 
Change-Id: Ia250914fecb288f82db6a7b53e70d433898eb2f4
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-01-02 08:10:02 +01:00
Qt Submodule Update Bot
a250914fec Updated submodules. 
Change-Id: Iec0c8697aa573d7bdec000ab2e6fb0729c0793bc
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-12-20 06:41:46 +01:00
Qt Submodule Update Bot
ec0c8697aa Updated submodules. 
Change-Id: I7c73e564bd61faa38fdd51947f8d98c03230f104
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-12-16 11:26:06 +01:00
Oswald Buddenhagen
dbac1e77f7 try to make the ChangeLog template more inviting 
move it even futher up and encourage integrating it into the rest of the
commit message.

Change-Id: I5aaa417a58d420c3d3a8d5ca80dcd9f265c64829
Reviewed-by: Sergio Ahumada <sahumada@gmail.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
 2013-11-30 15:24:54 +01:00
Qt Submodule Update Bot
7c73e564bd Updated submodules. 
Change-Id: I749bc264b23ead54af325301479320766afce090
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-11-10 17:10:04 +01:00
Qt Submodule Update Bot
749bc264b2 Updated submodules. 
Change-Id: I234dcbfcba1e934b05ed0da921f69700ca480ddf
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-11-06 12:19:01 +01:00
Qt Submodule Update Bot
234dcbfcba Updated submodules. 
Change-Id: Ib742f171c913b182d699270890599e3628d5df10
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-11-05 13:05:12 +01:00
Qt Submodule Update Bot
b742f171c9 Updated submodules. 
Change-Id: Ibabbfd7ae348a5b96999eb09820c1abe7094bcf6
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-11-04 21:57:31 +01:00
Qt Submodule Update Bot
babbfd7ae3 Updated submodules. 
Change-Id: I5987a236d059243d05d411cdc9f0193448a006ab
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-11-04 08:13:47 +01:00
Frederik Gladhorn
cf08b0d109 Add qtenginio as submodule 
Change-Id: Ida65ce0162fa65c37413ce6716eb6382e1593338
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-11-01 13:38:03 +01:00
Qt Submodule Update Bot
5987a236d0 Updated submodules. 
Change-Id: I08e6aa58fbddc3b18407593ef1fd6886b20370a0
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-11-01 07:32:42 +01:00
Qt Submodule Update Bot
08e6aa58fb Updated submodules. 
Change-Id: I8b4022260b5b1d1016979086d0fe7eeba44f8883
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-10-31 20:00:22 +01:00
Qt Submodule Update Bot
8b4022260b Updated submodules. 
Change-Id: Ic1160960655acf260a4ab47d9caea3b271a09bf6
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-10-31 11:03:11 +01:00
Allan Sandfeld Jensen
758d922716 Refine qt-module dependencies for massively parallel builds 
QtWebKit should be build after QtMultimedia for multimedia support on Mac
and Windows.

QtScript should be build after QtTools because an example uses UiTools.

Change-Id: Id92efac72d8c2c2237f21fad1ab823c1c1ac95dd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-10-24 18:48:58 +02:00
Qt Submodule Update Bot
c116096065 Updated submodules. 
Change-Id: I7e2e8cad6636584f1d3fc9d213363e5fc6243ef2
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
v5.2.0-beta1 		2013-10-22 05:27:19 +02:00
Qt Submodule Update Bot
7e2e8cad66 Updated submodules. 
Change-Id: Icb2d850b479fed9fed3c4a9fea698f924be942ef
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-10-16 18:38:03 +02:00
Qt Submodule Update Bot
cb2d850b47 Updated submodules. 
Change-Id: If9a5d1941655bd5cceaa7ded5893fea3206c5bea
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-10-15 21:01:19 +02:00
Qt Submodule Update Bot
f9a5d19416 Updated submodules. 
Change-Id: I7f523a7aa3a00d2190cbe7ca4c52a9a30cb67ea0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2013-10-12 23:23:49 +02:00
Mandeep Sandhu
728cd2e173 Ignore auto-generated file .qmake.super 
Added rule in .gitignore for .qmake.super.
This file is generated when building Qt from the root dir.

Task-number: QTBUG-33439
Change-Id: Ic15b10e9c7cb175f2ff102f75d08110acf13a0cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-10-08 15:45:02 +02:00
Oswald Buddenhagen
f09783bb80 move changelog entry before the real footers 
the change-id will be added at the end, which will look just plain
stupid if the other "real" footers come above the changelog.
also, a smart log author would integrate the changelog entry into the
flow of the message, so further up in the template is more natural.

Change-Id: I053840a81ea62f2e0ad1bd133f2e7a2692a6f2d6
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
 2013-10-08 15:44:55 +02:00
Sergio Ahumada
bc6bcaa323 qt.pro: Fix dependencies for qtconnectivity 
Remove the hard dependency on qtsystems and changing it
with a hard dependency on qtbase and a optional dependency
on qtdeclarative instead.

Change-Id: I96a4d3b38df588489e5ff4a704ea1e4fcbdb620c
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
 2013-10-08 15:44:50 +02:00
Qt Submodule Update Bot
7f523a7aa3 Updated submodules. 
Change-Id: Ie937791dcbe07d65728ab2cea1d590ab1eec8922
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-10-08 10:50:26 +02:00
J-P Nurmi
bf0bfeb991 Mark qtmultimedia as an optional dependency for qtwinextras 
The QtWinExtras Music Player example uses QtMultimedia.

Change-Id: Ib720710a8563d6bfa39aec8b82e9a87517b7e015
Reviewed-by: Mandeep Sandhu <mandeepsandhu.chd@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-10-08 10:48:23 +02:00
Qt Submodule Update Bot
e937791dcb Updated submodules. 
Change-Id: I2f20faa052b66b7e85802368cd42447f09d8e321
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-10-07 09:03:53 +02:00
Sergio Ahumada
0d22f2d30d Add new qtandroidextras repository 
Also adding it as part of the default modules.

Change-Id: I899ba6eec9ba6ab7103ecc6dba5245da16e01a32
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
v5.2.0-alpha1 		2013-09-27 12:53:47 +02:00
Sergio Ahumada
f3636c9757 Add qtmacextras#stable as part of the default modules 
Also updating the sha1 to the latest one that has passed
the CI already.

Change-Id: I88d803a738be59c377ef4c2315a855d2675331d4
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
 2013-09-27 12:53:41 +02:00
Qt Submodule Update Bot
2f20faa052 Updated submodules. 
Change-Id: Ie39f4e8b4be5da3d549c740ba396576bff7f952d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-09-26 08:00:01 +02:00
Sergio Ahumada
433e143b23 Merge branch 'dev' into stable 
Conflicts:
	qtjsbackend
 2013-09-23 12:24:59 +02:00
Sergio Ahumada
acd97fec50 Updated submodules. 
Change-Id: Iaaf1ec8b87ff1558d0cd5025bd4faf39a1b21e77
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-09-20 22:44:49 +02:00
Sergio Ahumada
2bcd8e1a9f Add qtlocation#dev as part of the default modules 
Change-Id: I6f684aa4b3a1fbefbaa89d8452035d9e93cd2b04
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
 2013-09-20 08:40:57 +02:00
Sergio Ahumada
23101c9dd5 Updated qtlocation submodule 
Change-Id: I40d980381231ed8a5103200b82570f284915e121
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-09-19 16:06:33 +02:00
Qt Submodule Update Bot
e39f4e8b4b Updated submodules. 
Change-Id: I770893c71b179aa87c1bf2d83318ba62c8c2aa96
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-09-16 18:34:26 +02:00
Qt Submodule Update Bot
270009dfde Updated submodules. 
Change-Id: I3840892d83b4c825c0a19a4326f5f392a2352585
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-09-13 12:44:52 +02:00
Sergio Ahumada
f3ee66d9b2 Merge "Merge branch 'stable' into dev" into refs/staging/dev 2013-09-12 09:02:30 +02:00
Qt Submodule Update Bot
3840892d83 Updated submodules. 
Change-Id: Iea9702923e86fc3decadbc831e31b349bd40ac44
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-09-12 08:25:26 +02:00
Sergio Ahumada
4072c25a70 Merge branch 'stable' into dev 
Conflicts:
	qt.pro

Change-Id: I21548a5c5c060939c58305bcbc5732d90f90bf82
 2013-09-11 13:31:41 +02:00
Qt Submodule Update Bot
ea9702923e Updated submodules. 
Change-Id: I70c2051332bb3404f4a63ec3ddc16e22bde13bd9
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-09-10 20:35:21 +02:00
Sergio Ahumada
96bd21c4c4 Add qtconnectivity#dev as part of the default modules 
Change-Id: I5c3885e411a1e097da7aa161ef678d85fc606191
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
 2013-09-10 20:11:42 +02:00
Qt Submodule Update Bot
70c2051332 Updated submodules. 
Change-Id: I85d30ddaa31fc6067d5741286c056981eec1a7e3
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-09-09 12:33:41 +02:00
Qt Submodule Update Bot
85d30ddaa3 Updated submodules. 
Change-Id: I6ca2fbea871d34e2dcd8f616599c34da7fe6f8dc
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-09-06 13:30:53 +02:00