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
753 Commits 118 Branches 270 Tags
d060acfac5d7f036d2daf395a80e0cde75e95a7b
Commit Graph

753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sergio Ahumada
d060acfac5 Add qtmacextras and qtwinextras to qt5.git#stable 
Change-Id: I440e8ad733feaadb07e74fb91342434f66bae160
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-06-26 05:48:00 +02:00
Sergio Ahumada
76e3f3d2a6 Merge branch 'release' into stable 
Conflicts:
	qtbase
	qtdeclarative
	qtmultimedia
	qtquick1
	qtquickcontrols
	qtsensors
	qttools

Change-Id: I7b101efc32108484a4237b2fbf9908c9b92fa267
 2013-06-24 08:40:03 +02:00
Sergio Ahumada
16e4fb6c98 configure: Fix srcpath when you run configure in the top-level dir 
Using the absolute path to configure, otherwise you get:

  [user@locahost qt5]$ ./configure -minimal
  + cd qtbase
  + ./qtbase/configure -minimal
  ./configure: line 58: ./qtbase/configure: No such file or directory

Change-Id: Ic7568cc571aaa52c56bcd28fa1b6bde8abb32c8e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-06-23 23:48:51 +02:00
Frederik Gladhorn
a3dd3624f9 Merge "Merge branch 'release' into stable" into refs/staging/stable 2013-06-23 14:17:44 +02:00
Qt Submodule Update Bot
e9b62c8c69 Updated submodules. 
Change-Id: I375328584b6361cd9f364be05b29afa5f33ac318
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-06-22 22:17:17 +02:00
Qt Submodule Update Bot
66b6d8fc7d Updated submodules. 
Change-Id: I6670595185ea486237fe71c156e081ffe8bb40cc
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-06-22 19:24:07 +02:00
Joerg Bornemann
8732a4c5cd fix Berlin's mirror URL 
Change-Id: Id3aaaa943370bece428a37dd8a1d89034fadeffd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Liang Qi <liang.qi@digia.com>
 2013-06-21 23:25:09 +02:00
Qt Submodule Update Bot
6670595185 Updated submodules. 
Change-Id: I6a60f386b899ec6a55dd780c40fa03f2738778de
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-06-21 17:33:02 +02:00
Sergio Ahumada
89e3b0deae Merge branch 'release' into stable 
Conflicts:
	qtactiveqt
	qtbase
	qtdeclarative
	qtdoc
	qtgraphicaleffects
	qtimageformats
	qtjsbackend
	qtmultimedia
	qtquick1
	qtquickcontrols
	qtscript
	qtsensors
	qtserialport
	qtsvg
	qttools
	qttranslations
	qtwebkit
	qtwebkit-examples
	qtx11extras
	qtxmlpatterns

Change-Id: I3abc0b033809366c993b0c358575e120c4f5953b
 2013-06-20 22:53:54 +02:00
Oswald Buddenhagen
8c2518eea4 rewrite top-level configures without perl 
otherwise the whole no-syncqt-and-thus-perl-needed stunt in qtbase would
be fairly useless for top-level builds.

Task-number: QTBUG-31786
Change-Id: I9f9b38091155a2d50ffec169267e0363fc24d3c0
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
 2013-06-20 14:58:18 +02:00
Sergio Ahumada
23a639d4cc Don't include README.git in source packages 
It doesn't make sense for non-git content anyways.

Change-Id: I9064de54657ab50caa526dab2830ee0d16054a9e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
 2013-06-18 12:57:06 +02:00
Qt Submodule Update Bot
6a60f386b8 Updated submodules. 
Change-Id: I511255ebfd7e046391e4b3f03f06f7ba84597cdb
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-06-17 20:38:19 +02:00
Qt Submodule Update Bot
375328584b Updated submodules. 
Change-Id: I35350e9779e2cc0507d1e1dd749ce2d22d011205
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-06-17 16:25:13 +02:00
Sergio Ahumada
7661124ff1 Update LICENSE.PREVIEW.COMMERCIAL license 
Change-Id: I2df37576f2bfda58d571e707c8b05c630848b769
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
 2013-06-17 09:25:48 +02:00
Qt Submodule Update Bot
35350e9779 Updated submodules. 
Change-Id: I111d8165f6f30a93014fa8a5d34d0171df3eb286
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-06-16 15:22:59 +02:00
Sergio Ahumada
80d90b4862 Updated submodules. 
Change-Id: If458a1b0946562ac8fea9f863a09862bba15527c
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
v5.1.0-rc1 		2013-06-15 06:22:11 +02:00
Qt Submodule Update Bot
511255ebfd Updated submodules. 
Change-Id: I188bb452fd59f6c0b4be329fd82f88f603daae0f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-06-14 10:33:28 +02:00
Qt Submodule Update Bot
111d8165f6 Updated submodules. 
Change-Id: I3918311aeb73f39e267beb8dd377c5822ae93536
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-06-13 07:44:22 +02:00
Qt Submodule Update Bot
188bb452fd Updated submodules. 
Change-Id: I3a770f5d4569edf4056b883d6533a7f4584b0ae1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-06-11 10:33:08 +02:00
Qt Submodule Update Bot
3918311aeb Updated submodules. 
Change-Id: I6a19225d751896cb5748cd20084a93bc62340cb8
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-06-11 05:45:22 +02:00
Qt Submodule Update Bot
6a19225d75 Updated submodules. 
Change-Id: If1d7bdd44443aaf5b60a61667d84adf6df98aaf5
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-06-09 08:48:03 +02:00
Qt Submodule Update Bot
f1d7bdd444 Updated submodules. 
Change-Id: I7d1e12cc1e24ab3e4b2de27b8974071691a7d7a1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-06-08 02:21:57 +02:00
Qt Submodule Update Bot
7d1e12cc1e Updated submodules. 
Change-Id: Icfdf021c18de12f80907bbd366ae1e03a362c61c
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-06-06 21:32:55 +02:00
Qt Submodule Update Bot
cfdf021c18 Updated submodules. 
Change-Id: I641bab7bdec259a9aed5be4d5f643828254e1ac4
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
 2013-06-05 17:04:46 +02:00
Qt Submodule Update Bot
641bab7bde Updated submodules. 
Change-Id: Ia11c7ef6709a97ea1352d2f3c10512da31700a2e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-06-04 08:56:06 +02:00
Qt Submodule Update Bot
3a770f5d45 Updated submodules. 
Change-Id: I049006602743ca4903ee71ab20c6f69639fb6ae1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-06-01 12:39:19 +02:00
Qt Submodule Update Bot
0490066027 Updated submodules. 
Change-Id: I3b9d57e4133feb47d847b928cfe54e2e15f1a186
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-05-31 22:30:32 +02:00
Qt Submodule Update Bot
a11c7ef670 Updated submodules. 
Change-Id: Iad91faa3bdb0faa8c2d5b23b00addaf6af01989d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-05-31 13:11:06 +02:00
Qt Submodule Update Bot
3b9d57e413 Updated submodules. 
Change-Id: I90ca6825c475bd22822edb3e95f78dcc5504038e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-05-31 11:48:44 +02:00
Sergio Ahumada
ecd64f626d Add license files mandated by (L)GPL. 
Change-Id: Id7a20353887bf50b7e39d5797fbaf31d2663921d
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
 2013-05-30 22:32:43 +02:00
Qt Submodule Update Bot
ad91faa3bd Updated submodules. 
Change-Id: I292a7a74309c378c8164dba7de4264fe4ad341de
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-05-29 13:01:57 +02:00
Sergio Ahumada
a0267228f9 Updated submodules. 
Change-Id: If89dd01d1987cdbf3de9927227d7345f2a43bdf5
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
 2013-05-28 13:30:54 +02:00
Qt Submodule Update Bot
90ca6825c4 Updated submodules. 
Change-Id: I4fcad903b132fa253bbc202463d99fceae64b220
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-05-28 08:28:39 +02:00
Qt Submodule Update Bot
4fcad903b1 Updated submodules. 
Change-Id: I7627c87948ff36902852a491177bd6ce9a9c6875
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-05-27 14:19:02 +02:00
Qt Submodule Update Bot
7627c87948 Updated submodules. 
Change-Id: I7e979b67af985dcd16b12199d3b8d29a6a0f5438
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-05-27 09:24:29 +02:00
Qt Submodule Update Bot
7e979b67af Updated submodules. 
Change-Id: I47fb446cbe5c8d85fbe29168adddd80abdc4963f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-05-26 18:34:30 +02:00
Qt Submodule Update Bot
47fb446cbe Updated submodules. 
Change-Id: Ieafc5686a62071ab835129ba97860ae13979758f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-05-26 06:07:56 +02:00
Qt Submodule Update Bot
eafc5686a6 Updated submodules. 
Change-Id: I7473ab6b3c111bbbce8a53420ee196b614850dc2
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-05-25 02:33:37 +02:00
Qt Submodule Update Bot
7473ab6b3c Updated submodules. 
Change-Id: I123cf8b2cb48921ac0eb73786efc1ddc3a7b4826
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-05-24 21:17:11 +02:00
Qt Submodule Update Bot
123cf8b2cb Updated submodules. 
Change-Id: Ibbc5dca735c3651ea01e6fd860348a2ad841ae1a
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-05-24 16:28:01 +02:00
Qt Submodule Update Bot
bbc5dca735 Updated submodules. 
Change-Id: Ibb9e60870c825fa336e1816f2402d72df4efabaa
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-05-24 11:28:06 +02:00
Qt Submodule Update Bot
bb9e60870c Updated submodules. 
Change-Id: Icbe70b9b60cb57634b6ef3e07f34983e6cc2738f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-05-23 21:57:11 +02:00
Qt Submodule Update Bot
cbe70b9b60 Updated submodules. 
Change-Id: I3814e96edd8db204eb93396c46b5d2812fb8898d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-05-23 16:43:12 +02:00
Sergio Ahumada
f89dd01d19 Merge branch 'stable' into release 
Conflicts:
	README
	qtwebkit-examples-and-demos

Change-Id: I23089d0f8a555d78e14f88bc55a48a78fe4a0e53
 2013-05-23 15:46:50 +02:00
Qt Submodule Update Bot
3814e96edd Updated submodules. 
Change-Id: I292a7a74309c378c8164dba7de4264fe4ad341de
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-05-23 11:29:54 +02:00
Qt Submodule Update Bot
292a7a7430 Updated submodules. 
Change-Id: I38dc5b49f6ba2b0c7053856ee815d58d7e2decd2
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-05-23 00:47:23 +02:00
Qt Submodule Update Bot
38dc5b49f6 Updated submodules. 
Change-Id: Ie78aad71e6d584fc4b8f0a831ed74370d85201ba
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-05-22 19:54:16 +02:00
Sergio Ahumada
45b8f5c7fc Updated qtquickcontrols submodule. 
Change-Id: If52b3428957e1e4ce8163696eb818f5cac1c4d3a
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
v5.1.0-beta1 		2013-05-11 19:02:05 +02:00
Qt Submodule Update Bot
e78aad71e6 Updated submodules. 
Change-Id: I80c8ed3c219e7e3526eb0c134b01ce2a0c2d8b26
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-05-09 12:22:54 +02:00
Oswald Buddenhagen
33072afc58 use relative submodule specs 
this saves various trouble.
this syntax is supported since git 1.7.0.

Change-Id: I5bbc31c2ba01e7ec0129bf45b9f704c380bf11a3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-05-01 06:12:31 +02:00