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

845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Blasche
4b256e249b Add QtAndroidExtras to dependency list of QtConnectivity 
We only need it for Android builds though.

Change-Id: I760dfd6038da2d4061326dd361ac517c9e674239
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2014-01-14 14:19:38 +01:00
Qt Submodule Update Bot
f37564a749 Updated submodules. 
Change-Id: Ibaac9b5129cd252d65ce5896bac05e96abe6859c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2014-01-11 11:59:15 +01:00
Qt Submodule Update Bot
baac9b5129 Updated submodules. 
Change-Id: If7b7ff4f9fdd710ef78a953113e87393597e3e80
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2014-01-09 07:52:59 +01:00
Qt Submodule Update Bot
f7b7ff4f9f Updated submodules. 
Change-Id: Id00002337613fa6681aed81193565ed7a5a4e472
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
 2013-12-16 12:41:55 +01:00
Sergio Ahumada
4c925babf9 Merge "Merge branch 'stable' into dev" into refs/staging/dev 2013-10-16 12:39:27 +02:00
Qt Submodule Update Bot
d000023376 Updated submodules. 
Change-Id: I1aa3ccbc4c789fb0ef265f88c9062b8bc591c449
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-10-15 20:33:49 +02:00
Sergio Ahumada
38b7c75f6b Merge branch 'stable' into dev 
Change-Id: I25b06e3ed27caab7b80c4e47a7e836559397c3c8
 2013-10-15 12:13:50 +02:00
Qt Submodule Update Bot
1aa3ccbc4c Updated submodules. 
Change-Id: I270009dfde0be0080902b6ea6a220ccf4095cb0e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-10-14 17:52:01 +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
Qt Submodule Update Bot
770893c71b Updated submodules. 
Change-Id: Idd9853b3cb6c7f8d1f015b82a06283b3942bf9bf
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-08-31 09:31:33 +02:00
Sergio Ahumada
c0594e303e Add qtwinextras#dev as part of the default modules 
Change-Id: Ic0f6d569576186abdf4f81f3b2f19d6805cba579
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-08-29 17:24:09 +02:00
Qt Submodule Update Bot
6ca2fbea87 Updated submodules. 
Change-Id: Ib6faaac71302be0c47b9904be5481c4b281e9008
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-08-29 17:24:04 +02:00
Frederik Gladhorn
33b6b2677e Add ChangeLog template. 
Change-Id: Ic0dfc0180634b630ac1359298f3d251b3d23e0a7
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
 2013-08-26 08:52:03 +02:00
Qt Submodule Update Bot
b6faaac713 Updated submodules. 
Change-Id: Ifb2020a44f9cddd7b969e038c611bf7cbadfeac8
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2013-08-21 20:39:31 +02:00
Alex Blasche
941dd92e5b Add --oslo option to init-repository 
Oslo devs can use a local git mirror.

Change-Id: Id6f919ff65ddf0c0b5839316014f51d2293008fd
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2013-08-21 09:42:07 +02:00
Alex Blasche
824cfe84a8 Cleanup of init-repository 
Removes old Nokia URLs and options associated with Nokia infrastructure

Change-Id: Id5a28d7ed14fe069ceff6afbe372aa69dda80475
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-08-20 08:37:04 +02:00
Oswald Buddenhagen
e8816c8ef4 purge qtjsbackend 
Change-Id: Ic761324c7b7afdfd509bea1db0d75ba259f8fb94
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-08-17 00:50:29 +02:00
Qt Submodule Update Bot
fb2020a44f Updated submodules. 
Change-Id: Ie3de6338ce0362c3d85ebb06e7b304521b27a1bd
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2013-08-15 22:59:54 +02:00
Qt Submodule Update Bot
e3de6338ce Updated submodules. 
Change-Id: Iad241de71b1302fedbe37c20fad2da71632ec46f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-08-13 14:27:57 +02:00
Simon Hausmann
2ede7f403a Remove qtjsbackend as dependency for qtdeclarative 
This is the first step. The next step is to remove it from qtdeclarative's
sync.profile after this integrates.

Change-Id: Ice1424f3d01d8eb4082200900498bbb19392492b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-08-13 02:52:05 +02:00
Qt Submodule Update Bot
ad241de71b Updated submodules. 
Change-Id: I51c0a11ff3a3914cac1baf2a4fa6ef826089860f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-08-12 20:49:57 +02:00
Qt Submodule Update Bot
dd9853b3cb Updated submodules. 
Change-Id: I35fe76d9c343f98ec55c7cacd8c402e90d91ef38
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-08-07 10:33:43 +02:00
Nico Vertriest
a145dba334 Doc: specified how to install documentation 
Added command "make install_docs"

Task-number: QTBUG-32212
Change-Id: Ic5bfd76bf7233565616b8c248ce3ccdeb05f8803
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
 2013-08-06 13:26:59 +02:00
J-P Nurmi
94eef4e5f7 qtwinextras: add qtdeclarative as an optional dependency 
qtwinextras contains optional QML types, so qtdeclarative must
be listed as an optional dependency to avoid build breaks.

Change-Id: I7d7f3bfca73c6599699a1da9c8795e6ac9ca4a74
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-08-04 18:45:19 +02:00
Qt Submodule Update Bot
35fe76d9c3 Updated submodules. 
Change-Id: I23c300afd1395538d8702d0f188ca7031fbcf9d6
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2013-07-30 06:43:51 +02:00
Qt Submodule Update Bot
51c0a11ff3 Updated submodules. 
Change-Id: Id06469a62635d263631c308ffa2d16a794a6b75f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2013-07-29 13:03:17 +02:00
Qt Submodule Update Bot
d06469a626 Updated submodules. 
Change-Id: I292fa5832ffb6890479a220ee07c7020f313537c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2013-07-24 17:26:16 +02:00
Qt Submodule Update Bot
292fa5832f Updated submodules. 
Change-Id: If5e182de18267e8d54919b7e20d650582ff3f467
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2013-07-24 06:13:55 +02:00