qiurui
/
qt5
mirror of https://github.com/qt/qt5.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'gerrit/dev' into stable 

Change-Id: I7e15ecc9ce71063757677e5c8b07e3c0167c857c
This commit is contained in:
Oswald Buddenhagen 2014-02-19 16:13:02 +01:00
parent dc199e37d5 a7dc6fd595
commit a3152cb8f1
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -103,3 +103,6 @@
[submodule "qtenginio"] [submodule "qtenginio"]
path = qtenginio path = qtenginio
url = ../qtenginio.git url = ../qtenginio.git
[submodule "qtwebsockets"]
path = qtwebsockets
url = ../qtwebsockets.git

2
init-repository
View File

@ -231,6 +231,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
qtwayland qtwayland
qtwebkit qtwebkit
qtwebkit-examples qtwebkit-examples
qtwebsockets
qtwinextras qtwinextras
qtx11extras qtx11extras
qtxmlpatterns qtxmlpatterns
@ -258,6 +259,7 @@ my @DEFAULT_REPOS = qw(
qtsvg qtsvg
qttools qttools
qttranslations qttranslations
qtwebsockets
qtwebkit qtwebkit
qtwebkit-examples qtwebkit-examples
qtwinextras qtwinextras

6
qt.pro
View File

@ -54,6 +54,9 @@ defineTest(addModule) {
# users responsibility to ensure that all needed dependencies exist, or # users responsibility to ensure that all needed dependencies exist, or
# it may not build. # it may not build.
ANDROID_EXTRAS =
android: ANDROID_EXTRAS = qtandroidextras
addModule(qtbase) addModule(qtbase)
addModule(qtandroidextras, qtbase) addModule(qtandroidextras, qtbase)
addModule(qtmacextras, qtbase) addModule(qtmacextras, qtbase)
@ -71,7 +74,7 @@ addModule(qtjsondb, qtdeclarative)
addModule(qtsystems, qtbase, qtdeclarative) addModule(qtsystems, qtbase, qtdeclarative)
addModule(qtlocation, qtbase, qt3d qtsystems qtmultimedia) addModule(qtlocation, qtbase, qt3d qtsystems qtmultimedia)
addModule(qtsensors, qtbase, qtdeclarative) addModule(qtsensors, qtbase, qtdeclarative)
addModule(qtconnectivity, qtbase, qtdeclarative) addModule(qtconnectivity, qtbase $$ANDROID_EXTRAS, qtdeclarative)
addModule(qtfeedback, qtdeclarative, qtmultimedia) addModule(qtfeedback, qtdeclarative, qtmultimedia)
addModule(qtpim, qtdeclarative, qtjsondb) addModule(qtpim, qtdeclarative, qtjsondb)
addModule(qtwebkit, qtdeclarative, qtlocation qtmultimedia qtsensors, WebKit.pro) addModule(qtwebkit, qtdeclarative, qtlocation qtmultimedia qtsensors, WebKit.pro)
@ -85,6 +88,7 @@ addModule(qtdocgallery, qtdeclarative, qtjsondb)
!win32:!mac:addModule(qtwayland, qtbase, qtdeclarative) !win32:!mac:addModule(qtwayland, qtbase, qtdeclarative)
addModule(qtserialport, qtbase) addModule(qtserialport, qtbase)
addModule(qtenginio, qtdeclarative) addModule(qtenginio, qtdeclarative)
addModule(qtwebsockets, qtbase, qtdeclarative)
addModule(qttranslations, qttools) addModule(qttranslations, qttools)
addModule(qtdoc, qtdeclarative) addModule(qtdoc, qtdeclarative)
addModule(qtqa, qtbase) addModule(qtqa, qtbase)

1
qtwebsockets Submodule

@ -0,0 +1 @@
Subproject commit 1edb9b0d43d9ad688fb21f93f04922ab4542f760