mirror of
git://code.qt.io/qt/qt5.git
synced 2026-01-16 20:06:45 +08:00
Compare commits
54 Commits
v5.3.0-alp
...
v5.2.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
17e103bb5d | ||
|
|
cbb3e6068e | ||
|
|
a4f6e14fc2 | ||
|
|
e259fdadce | ||
|
|
44e7f5d2e3 | ||
|
|
9710c4f2d2 | ||
|
|
1d94d5ec03 | ||
|
|
7f32937275 | ||
|
|
f92227236c | ||
|
|
563b32ee25 | ||
|
|
02353a4b3e | ||
|
|
b5594043bc | ||
|
|
323825a1db | ||
|
|
d8f6092efd | ||
|
|
e2d566a72d | ||
|
|
0ea66cab6e | ||
|
|
100c98b9fc | ||
|
|
27f8dc93ae | ||
|
|
f62385a213 | ||
|
|
948ce9ed9e | ||
|
|
284765a1be | ||
|
|
eda3b9c308 | ||
|
|
f3f634ae66 | ||
|
|
fbb4041031 | ||
|
|
b7081d3f13 | ||
|
|
52a9312100 | ||
|
|
fc6f18a589 | ||
|
|
83768ab768 | ||
|
|
e137a789a9 | ||
|
|
0533da6bc1 | ||
|
|
d5cc1add47 | ||
|
|
33606f80b5 | ||
|
|
056329bd5c | ||
|
|
c4605dfbf0 | ||
|
|
000a215563 | ||
|
|
7b5e4f67b7 | ||
|
|
b9a6f134d8 | ||
|
|
8ec5f76383 | ||
|
|
8abcedd5bd | ||
|
|
ef7a925802 | ||
|
|
36ed7ab38d | ||
|
|
a44fe424bc | ||
|
|
e1325f4c4c | ||
|
|
f243edd33f | ||
|
|
df81b47f57 | ||
|
|
5d1f1f2817 | ||
|
|
1421f888a7 | ||
|
|
3d55ee3e80 | ||
|
|
02567c71ad | ||
|
|
d6f8db264e | ||
|
|
c21bee55a5 | ||
|
|
ad03e256c0 | ||
|
|
441527d168 | ||
|
|
62187932be |
@@ -12,6 +12,9 @@
|
||||
# One task per entry. Remember space after colon.
|
||||
#Task-number:
|
||||
#
|
||||
# Solicit reviewers. They still need to use the Gerrit frontend.
|
||||
#Reviewed-by:
|
||||
#
|
||||
# ==[ Please wrap at 72 characters ]===================================|
|
||||
#
|
||||
# Remember to read http://wiki.qt-project.org/Commit_Policy
|
||||
|
||||
6
.gitmodules
vendored
6
.gitmodules
vendored
@@ -28,6 +28,9 @@
|
||||
[submodule "qtdoc"]
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
[submodule "qlalr"]
|
||||
path = qlalr
|
||||
url = ../qlalr.git
|
||||
[submodule "qtrepotools"]
|
||||
path = qtrepotools
|
||||
url = ../qtrepotools.git
|
||||
@@ -100,6 +103,3 @@
|
||||
[submodule "qtenginio"]
|
||||
path = qtenginio
|
||||
url = ../qtenginio.git
|
||||
[submodule "qtwebsockets"]
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
|
||||
@@ -200,6 +200,7 @@ my %PROTOCOLS = (
|
||||
my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
|
||||
qt3d
|
||||
qt5
|
||||
qlalr
|
||||
qtactiveqt
|
||||
qtandroidextras
|
||||
qtbase
|
||||
@@ -230,7 +231,6 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
|
||||
qtwayland
|
||||
qtwebkit
|
||||
qtwebkit-examples
|
||||
qtwebsockets
|
||||
qtwinextras
|
||||
qtx11extras
|
||||
qtxmlpatterns
|
||||
@@ -258,7 +258,6 @@ my @DEFAULT_REPOS = qw(
|
||||
qtsvg
|
||||
qttools
|
||||
qttranslations
|
||||
qtwebsockets
|
||||
qtwebkit
|
||||
qtwebkit-examples
|
||||
qtwinextras
|
||||
|
||||
1
qlalr
Submodule
1
qlalr
Submodule
Submodule qlalr added at a803a5c214
8
qt.pro
8
qt.pro
@@ -3,7 +3,6 @@ cache(, super)
|
||||
|
||||
CONFIG += build_pass # hack to disable the .qmake.super auto-add
|
||||
load(qt_build_config)
|
||||
CONFIG -= build_pass # unhack, as it confuses Qt Creator
|
||||
|
||||
TEMPLATE = subdirs
|
||||
|
||||
@@ -54,13 +53,11 @@ defineTest(addModule) {
|
||||
# users responsibility to ensure that all needed dependencies exist, or
|
||||
# it may not build.
|
||||
|
||||
ANDROID_EXTRAS =
|
||||
android: ANDROID_EXTRAS = qtandroidextras
|
||||
|
||||
addModule(qtbase)
|
||||
addModule(qtandroidextras, qtbase)
|
||||
addModule(qtmacextras, qtbase)
|
||||
addModule(qtx11extras, qtbase)
|
||||
addModule(qlalr, qtbase)
|
||||
addModule(qtsvg, qtbase)
|
||||
addModule(qtxmlpatterns, qtbase)
|
||||
addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns)
|
||||
@@ -73,7 +70,7 @@ addModule(qtjsondb, qtdeclarative)
|
||||
addModule(qtsystems, qtbase, qtdeclarative)
|
||||
addModule(qtlocation, qtbase, qt3d qtsystems qtmultimedia)
|
||||
addModule(qtsensors, qtbase, qtdeclarative)
|
||||
addModule(qtconnectivity, qtbase $$ANDROID_EXTRAS, qtdeclarative)
|
||||
addModule(qtconnectivity, qtbase, qtdeclarative)
|
||||
addModule(qtfeedback, qtdeclarative, qtmultimedia)
|
||||
addModule(qtpim, qtdeclarative, qtjsondb)
|
||||
addModule(qtwebkit, qtdeclarative, qtlocation qtmultimedia qtsensors, WebKit.pro)
|
||||
@@ -87,7 +84,6 @@ addModule(qtdocgallery, qtdeclarative, qtjsondb)
|
||||
!win32:!mac:addModule(qtwayland, qtbase, qtdeclarative)
|
||||
addModule(qtserialport, qtbase)
|
||||
addModule(qtenginio, qtdeclarative)
|
||||
addModule(qtwebsockets, qtbase, qtdeclarative)
|
||||
addModule(qttranslations, qttools)
|
||||
addModule(qtdoc, qtdeclarative)
|
||||
addModule(qtqa, qtbase)
|
||||
|
||||
Submodule qtactiveqt updated: 2e44efa505...d6d1217473
Submodule qtandroidextras updated: 69f8652622...f4e81f8ca5
2
qtbase
2
qtbase
Submodule qtbase updated: 45e17d0cc7...62feb088a3
Submodule qtconnectivity updated: c969ca25b2...44fd56d22e
Submodule qtdeclarative updated: 7d25db8ff4...b433c4b5a7
2
qtdoc
2
qtdoc
Submodule qtdoc updated: 15c0c98d44...f308fb8a19
Submodule qtgraphicaleffects updated: 9b1883d2e9...e8c1b8423a
Submodule qtimageformats updated: 37e34e1f36...b742f21e41
Submodule qtlocation updated: e656c31890...959468ed1b
Submodule qtmacextras updated: 63ea1f8b4c...df23cbf333
Submodule qtmultimedia updated: d964388b38...d19bede8ad
2
qtqa
2
qtqa
Submodule qtqa updated: 5f4a961316...afafbfafd9
2
qtquick1
2
qtquick1
Submodule qtquick1 updated: 3eeaf98712...a4476cc12e
Submodule qtquickcontrols updated: 44e9533361...08a32dff66
Submodule qtrepotools updated: e3345e6cb1...0f80e8a8fa
2
qtscript
2
qtscript
Submodule qtscript updated: b95d7d3425...a2da34be84
Submodule qtsensors updated: 2b67b50af1...07d0e9d579
Submodule qtserialport updated: c2b0416475...84ec01711a
2
qtsvg
2
qtsvg
Submodule qtsvg updated: cd0843d4d7...62c8144782
2
qttools
2
qttools
Submodule qttools updated: 2e74382c09...cc253a0469
Submodule qttranslations updated: a104c706a4...f0283f70a3
2
qtwebkit
2
qtwebkit
Submodule qtwebkit updated: 6cec10879f...99113b7cc7
Submodule qtwebkit-examples updated: 0a23233f9c...5c814406c6
Submodule qtwebsockets deleted from 2bf36986a1
Submodule qtwinextras updated: 863cb45550...8ddbbfd4c8
Submodule qtx11extras updated: d229decb2d...9131e081b9
Submodule qtxmlpatterns updated: 943be69584...831c6a4ec2
Reference in New Issue
Block a user