Added new module, qtwayland.
authorRohan McGovern <rohan.mcgovern@nokia.com>
Mon, 26 Sep 2011 23:21:52 +0000 (09:21 +1000)
committerQt by Nokia <qt-info@nokia.com>
Tue, 27 Sep 2011 08:41:04 +0000 (10:41 +0200)
Not yet enabled by default.

Change-Id: I6f22e7d69743415ec8f9588a8621cd28ca6d8eda
Reviewed-on: http://codereview.qt-project.org/5580
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
.gitmodules
init-repository
qt.pro
qtwayland [new submodule]

index 6c0741c..48fc82c 100644 (file)
@@ -73,3 +73,6 @@
 [submodule "qtconnectivity"]
        path = qtconnectivity
        url = git://gitorious.org/qt/qtconnectivity.git
+[submodule "qtwayland"]
+       path = qtwayland
+       url = git://gitorious.org/qt/qtwayland.git
index fede791..dd15d5a 100755 (executable)
@@ -240,6 +240,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qtsystems
     qttools
     qttranslations
+    qtwayland
     qtwebkit-examples-and-demos
     qtxmlpatterns
 );
diff --git a/qt.pro b/qt.pro
index ade52b5..3a00da4 100644 (file)
--- a/qt.pro
+++ b/qt.pro
@@ -97,6 +97,12 @@ module_qtconnectivity.subdir = $$IN_PWD/qtconnectivity
 module_qtconnectivity.target = module-qtconnectivity
 module_qtconnectivity.depends = module_qtsystems
 
+module_qtwayland.subdir = $$IN_PWD/qtwayland
+module_qtwayland.target = module-qtwayland
+module_qtwayland.depends = module_qtbase
+# not yet enabled by default
+module_qtwayland.CONFIG = no_default_target no_default_install
+
 # only qtbase is required to exist. The others may not - but it is the
 # users responsibility to ensure that all needed dependencies exist, or
 # it may not build.
@@ -123,6 +129,7 @@ exists(qtquick3d/qtquick3d.pro): SUBDIRS += module_qtquick3d
 exists(qtdocgallery/qtdocgallery.pro): SUBDIRS += module_qtdocgallery
 exists(qtpim/qtpim.pro): SUBDIRS += module_qtpim
 exists(qtconnectivity/qtconnectivity.pro): SUBDIRS += module_qtconnectivity
+exists(qtwayland/qtwayland.pro): SUBDIRS += module_qtwayland
 
 exists(qtwebkit/Tools/Scripts/build-webkit) {
     SUBDIRS +=  module_qtwebkit \
diff --git a/qtwayland b/qtwayland
new file mode 160000 (submodule)
index 0000000..70d90b9
--- /dev/null
+++ b/qtwayland
@@ -0,0 +1 @@
+Subproject commit 70d90b989e2dd0192e92808702d7b106a34354cc