mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-20 03:46:44 +08:00
Add new modules (qtquickcontrols, qtserialport and qtx11extras)
Also adding qtsensors as part of the default modules and updating its sha1. Change-Id: I39f89f2d26725575d791d185aa452bc1f420a8da Reviewed-by: David Faure (KDE) <faure@kde.org>
This commit is contained in:
committed by
The Qt Project
parent
66ed87fc67
commit
63aceeacaf
9
.gitmodules
vendored
9
.gitmodules
vendored
@@ -85,3 +85,12 @@
|
|||||||
[submodule "qtgraphicaleffects"]
|
[submodule "qtgraphicaleffects"]
|
||||||
path = qtgraphicaleffects
|
path = qtgraphicaleffects
|
||||||
url = git://gitorious.org/qt/qtgraphicaleffects.git
|
url = git://gitorious.org/qt/qtgraphicaleffects.git
|
||||||
|
[submodule "qtquickcontrols"]
|
||||||
|
path = qtquickcontrols
|
||||||
|
url = git://gitorious.org/qt/qtquickcontrols.git
|
||||||
|
[submodule "qtserialport"]
|
||||||
|
path = qtserialport
|
||||||
|
url = git://gitorious.org/qt/qtserialport.git
|
||||||
|
[submodule "qtx11extras"]
|
||||||
|
path = qtx11extras
|
||||||
|
url = git://gitorious.org/qt/qtx11extras.git
|
||||||
|
|||||||
@@ -230,9 +230,11 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
|
|||||||
qtpim
|
qtpim
|
||||||
qtqa
|
qtqa
|
||||||
qtquick1
|
qtquick1
|
||||||
|
qtquickcontrols
|
||||||
qtrepotools
|
qtrepotools
|
||||||
qtscript
|
qtscript
|
||||||
qtsensors
|
qtsensors
|
||||||
|
qtserialport
|
||||||
qtsvg
|
qtsvg
|
||||||
qtsystems
|
qtsystems
|
||||||
qttools
|
qttools
|
||||||
@@ -240,6 +242,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
|
|||||||
qtwayland
|
qtwayland
|
||||||
qtwebkit
|
qtwebkit
|
||||||
qtwebkit-examples-and-demos
|
qtwebkit-examples-and-demos
|
||||||
|
qtx11extras
|
||||||
qtxmlpatterns
|
qtxmlpatterns
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -254,13 +257,17 @@ my @DEFAULT_REPOS = qw(
|
|||||||
qtmultimedia
|
qtmultimedia
|
||||||
qtqa
|
qtqa
|
||||||
qtquick1
|
qtquick1
|
||||||
|
qtquickcontrols
|
||||||
qtrepotools
|
qtrepotools
|
||||||
qtscript
|
qtscript
|
||||||
|
qtsensors
|
||||||
|
qtserialport
|
||||||
qtsvg
|
qtsvg
|
||||||
qttools
|
qttools
|
||||||
qttranslations
|
qttranslations
|
||||||
qtwebkit
|
qtwebkit
|
||||||
qtwebkit-examples-and-demos
|
qtwebkit-examples-and-demos
|
||||||
|
qtx11extras
|
||||||
qtxmlpatterns
|
qtxmlpatterns
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
3
qt.pro
3
qt.pro
@@ -50,11 +50,13 @@ defineTest(addModule) {
|
|||||||
# it may not build.
|
# it may not build.
|
||||||
|
|
||||||
addModule(qtbase)
|
addModule(qtbase)
|
||||||
|
addModule(qtx11extras, qtbase)
|
||||||
addModule(qlalr, qtbase)
|
addModule(qlalr, qtbase)
|
||||||
addModule(qtsvg, qtbase)
|
addModule(qtsvg, qtbase)
|
||||||
addModule(qtxmlpatterns, qtbase)
|
addModule(qtxmlpatterns, qtbase)
|
||||||
addModule(qtjsbackend, qtbase)
|
addModule(qtjsbackend, qtbase)
|
||||||
addModule(qtdeclarative, qtjsbackend, qtsvg qtxmlpatterns)
|
addModule(qtdeclarative, qtjsbackend, qtsvg qtxmlpatterns)
|
||||||
|
addModule(qtquickcontrols, qtdeclarative)
|
||||||
addModule(qtmultimedia, qtdeclarative)
|
addModule(qtmultimedia, qtdeclarative)
|
||||||
addModule(qtactiveqt, qtbase)
|
addModule(qtactiveqt, qtbase)
|
||||||
addModule(qt3d, qtdeclarative)
|
addModule(qt3d, qtdeclarative)
|
||||||
@@ -74,6 +76,7 @@ addModule(qtscript, qtbase)
|
|||||||
addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit qttools)
|
addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit qttools)
|
||||||
addModule(qtdocgallery, qtdeclarative, qtjsondb)
|
addModule(qtdocgallery, qtdeclarative, qtjsondb)
|
||||||
!win32:!mac:addModule(qtwayland, qtbase, qtdeclarative)
|
!win32:!mac:addModule(qtwayland, qtbase, qtdeclarative)
|
||||||
|
addModule(qtserialport, qtbase)
|
||||||
addModule(qttranslations, qttools)
|
addModule(qttranslations, qttools)
|
||||||
addModule(qtdoc, qtdeclarative)
|
addModule(qtdoc, qtdeclarative)
|
||||||
addModule(qtqa, qtbase)
|
addModule(qtqa, qtbase)
|
||||||
|
|||||||
1
qtquickcontrols
Submodule
1
qtquickcontrols
Submodule
Submodule qtquickcontrols added at 73b217015c
Submodule qtsensors updated: b550c4980c...6a4f3ba1b1
1
qtserialport
Submodule
1
qtserialport
Submodule
Submodule qtserialport added at 104780b1c8
1
qtx11extras
Submodule
1
qtx11extras
Submodule
Submodule qtx11extras added at 0ce7f8ac3d
Reference in New Issue
Block a user