diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-09-27 09:21:52 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-27 10:41:04 +0200 |
| commit | 80f75f093c8d860c51155625b7c4fb112c3f6e7f (patch) | |
| tree | 03554b1bc5e79dc652bddc69688cf476a2c0c3e5 | |
| parent | 472e486c3a8a4a0a402c7e178b69d2a907bbe849 (diff) | |
Added new module, qtwayland.
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>
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rwxr-xr-x | init-repository | 1 | ||||
| -rw-r--r-- | qt.pro | 7 | ||||
| m--------- | qtwayland | 0 |
4 files changed, 11 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 6c0741c9..48fc82cc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/init-repository b/init-repository index fede7914..dd15d5a9 100755 --- a/init-repository +++ b/init-repository @@ -240,6 +240,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw( qtsystems qttools qttranslations + qtwayland qtwebkit-examples-and-demos qtxmlpatterns ); @@ -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 +Subproject 70d90b989e2dd0192e92808702d7b106a34354c |