lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-22 22:40:03 +08:00
Code Issues Packages Projects Releases Wiki Activity
792 Commits 120 Branches 272 Tags
2ede7f403a465f5d9746e069c88a918fa7d807c4
Commit Graph

792 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Qt Submodule Update Bot
f5e182de18 Updated submodules. 
Change-Id: I0927a9a0f8b0cedac8027eec865d3e2118078054
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-07-21 01:32:35 +02:00
Qt Submodule Update Bot
0927a9a0f8 Updated submodules. 
Change-Id: If350c3bb5172d5de13a162e9e5ba2720eb890c14
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-07-19 13:55:07 +02:00
Qt Submodule Update Bot
f350c3bb51 Updated submodules. 
Change-Id: Ia289ec8a0390ff4c0b957cd7f4d7c8cd726e2d1d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-07-14 11:08:56 +02:00
Sergio Ahumada
33aa233ae4 Merge "Merge branch 'stable' into dev" into refs/staging/dev 2013-07-14 11:07:55 +02:00
Qt Submodule Update Bot
a289ec8a03 Updated submodules. 
Change-Id: Ie9b62c8c6914428014c30be7e3cf0889372ee0b6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-07-13 00:19:56 +02:00
Sergio Ahumada
6a0f795172 Merge branch 'stable' into dev 
Conflicts:
	qtactiveqt
	qtbase
	qtdeclarative
	qtdoc
	qtgraphicaleffects
	qtjsbackend
	qtmultimedia
	qtquick1
	qtquickcontrols
	qtscript
	qtsensors
	qtserialport
	qtsvg
	qttools
	qttranslations
	qtwebkit
	qtwebkit-examples
	qtxmlpatterns

Change-Id: I5ca751a71375fba0c154db187e89bac6f3fa7ad1
 2013-07-11 13:29:44 +02:00
Qt Submodule Update Bot
e16cdebb77 Updated submodules. 
Change-Id: I8e11fdb9392d8fcff7b1b1b2673891ea77d6cf0e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-07-11 00:48:20 +02:00
Qt Submodule Update Bot
8e11fdb939 Updated submodules. 
Change-Id: I9b68559f3cc82db32e93d4040fa2b17f8315397b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-07-10 18:34:53 +02:00
Oswald Buddenhagen
ef8000991e leave makefile generation to the real configure 
call it with the "secret" -top-level option, which shifts the makefile
generation one level up.

this makes the configure call the last thing we do, thus also avoiding
the problems we had with the -help switch (and the previous attempts at
fixing it).

Change-Id: I80ba4a09b260a140a9d1b976277c30fd1436b4d6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
 2013-07-10 06:30:46 +02:00
Qt Submodule Update Bot
9b68559f3c Updated submodules. 
Change-Id: I20ecf7efa58302efc96b80a1da136a19e4946f4b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-07-09 04:46:44 +02:00
Qt Submodule Update Bot
20ecf7efa5 Updated submodules. 
Change-Id: I5ae49dac5a57f3a691713781a7f5390a44d6c8ec
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-07-05 21:43:37 +02:00
Qt Submodule Update Bot
5ae49dac5a Updated submodules. 
Change-Id: I0e9f726baf60c4af7caa2ef403f087cb915b420b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-07-02 15:19:05 +02:00
Qt Submodule Update Bot
0e9f726baf Updated submodules. 
Change-Id: Ie9b62c8c6914428014c30be7e3cf0889372ee0b6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-06-29 16:25:54 +02:00
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
f3d6fe82ab Merge branch 'stable' into dev 
Conflicts:
	qtactiveqt
	qtbase
	qtdeclarative
	qtdoc
	qtgraphicaleffects
	qtimageformats
	qtjsbackend
	qtmultimedia
	qtquick1
	qtquickcontrols
	qtscript
	qtsensors
	qtserialport
	qtsvg
	qttools
	qttranslations
	qtwebkit
	qtwebkit-examples
	qtx11extras
	qtxmlpatterns

Change-Id: Ie3f5321de50ec76a7b3f5a0e2d2be1835abce527
 2013-06-24 18:34:14 +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
Qt Submodule Update Bot
df0a7fd6dc Updated submodules. 
Change-Id: I7124fb036a5cdbc24eb8f818493deb2d13d1fe2d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-06-22 09:46:43 +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
7124fb036a Updated submodules. 
Change-Id: If828e05a91be62763bb1872ba828f71012c96b06
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-06-21 20:34:56 +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
Alex Blasche
28460e497c Remove JsonDB from QtSystems and QtLocation dependency list 
There is no optional jsondb build anymore

Change-Id: I902464dec14555794e80dde9eb81ca2dad2baeda
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-06-21 07:56:06 +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
f828e05a91 Updated submodules. 
Change-Id: I3a55bb51ac59f7e66b8a75f574e494a8da0a2754
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-06-16 20:33:57 +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