lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-19 11:36:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
977 Commits 120 Branches 274 Tags
9c93bd3195acf8a1b7f32b7140eb93d38c4eef00
Commit Graph

977 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
000a215563 Updated submodules. 
Change-Id: I7b5e4f67b7e5c6701be8827384098401b4e66e57
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-08-15 21:34:30 +02:00
Qt Submodule Update Bot
7b5e4f67b7 Updated submodules. 
Change-Id: Ib9a6f134d8e8186af858d148fa1941ce85ae1166
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-08-14 10:07:56 +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
b9a6f134d8 Updated submodules. 
Change-Id: I8ec5f763832e10a2a33f598113261a715c873bb2
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-08-12 08:24:27 +02:00
Qt Submodule Update Bot
8ec5f76383 Updated submodules. 
Change-Id: I8abcedd5bd3e82aa2b4acc0271e7fba402b8efab
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-08-09 21:13:34 +02:00
Qt Submodule Update Bot
8abcedd5bd Updated submodules. 
Change-Id: Ief7a92580221b4c3fe6521abea165f5181d800fb
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-08-09 08:18:36 +02:00
Qt Submodule Update Bot
ef7a925802 Updated submodules. 
Change-Id: I36ed7ab38d3b61a01fe2b0989c2cb404e72afc9b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-08-08 08:56:35 +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
Qt Submodule Update Bot
36ed7ab38d Updated submodules. 
Change-Id: Ia44fe424bc986bcc308194d4068e9d79d73f1167
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-08-06 14:50:31 +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
a44fe424bc Updated submodules. 
Change-Id: Ie1325f4c4c9b1b9b560ccee63171f7adf008df2c
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-08-02 21:36:35 +02:00
Qt Submodule Update Bot
e1325f4c4c Updated submodules. 
Change-Id: If243edd33f2018ff92cd27ac1eabfa75ae52f11b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-07-31 19:52:57 +02:00
Qt Submodule Update Bot
f243edd33f Updated submodules. 
Change-Id: Idf81b47f57cdc5b00cbd7d159bec6eabc95f4ac1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-07-30 18:37:24 +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
df81b47f57 Updated submodules. 
Change-Id: I5d1f1f2817d32b93432caf639d508d56a59d9430
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-07-27 21:36:48 +02:00
Qt Submodule Update Bot
5d1f1f2817 Updated submodules. 
Change-Id: I1421f888a7be71b786df796772064f8d1b2f0157
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-07-27 11:46:00 +02:00
Qt Submodule Update Bot
1421f888a7 Updated submodules. 
Change-Id: I3d55ee3e80b0d03479a88d0272c079bd8c32a890
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-07-26 08:07:43 +02:00
Qt Submodule Update Bot
3d55ee3e80 Updated submodules. 
Change-Id: I02567c71ad64d474848263fc6636b243ab5d2665
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-07-25 17:44:21 +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
02567c71ad Updated submodules. 
Change-Id: Id6f8db264e59d8b6c5d4f81e030c0943bcfeade3
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-07-24 14:13:14 +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
23c300afd1 Updated submodules. 
Change-Id: I6d1d35416f07bb6dc4e4a43296ff5028e96495a3
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-07-23 10:32:41 +02:00
Qt Submodule Update Bot
d6f8db264e Updated submodules. 
Change-Id: Iad03e256c0e0ab29e2759579caf7ad93b0a4416e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-07-22 22:30:31 +02:00
Qt Submodule Update Bot
6d1d35416f Updated submodules. 
Change-Id: I6493c3d8137a4659814949f96465d374dbad1781
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-07-21 10:54:29 +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
6493c3d813 Updated submodules. 
Change-Id: I7b8a659ecc931702210ad0b10afa8b283f758632
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-07-20 18:39:58 +02:00
Qt Submodule Update Bot
7b8a659ecc Updated submodules. 
Change-Id: Ic3532a18c95b80d06c1e7d7875698ffc8b816140
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-07-20 09:46:23 +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
c3532a18c9 Updated submodules. 
Change-Id: Ic57a761615178f0337f1609653798e268c1b7df1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-07-18 12:23:14 +02:00
Qt Submodule Update Bot
c57a761615 Updated submodules. 
Change-Id: I8c4e0a4a952655b623dbff0ddf1a75d4a1d772f2
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-07-17 15:12:10 +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
8c4e0a4a95 Updated submodules. 
Change-Id: I0b24bc3851237425f0738df422a20ade09095681
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-07-13 11:41:49 +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
Qt Submodule Update Bot
0b24bc3851 Updated submodules. 
Change-Id: Ie16cdebb775c1a7c3f35f7ea68e017c38ce3fd36
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-07-11 18:39:47 +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
Sergio Ahumada
c21bee55a5 Updated submodules. 
Change-Id: I2523a9d712571ec411dde0e547c4a5ad0c17e977
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
v5.1.0 		2013-07-01 20:11:45 +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