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 ); diff --git a/qt.pro b/qt.pro index ade52b51..3a00da46 100644 --- 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 index 00000000..70d90b98 --- /dev/null +++ b/qtwayland @@ -0,0 +1 @@ +Subproject commit 70d90b989e2dd0192e92808702d7b106a34354cc