mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 19:36:04 +08:00
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>
This commit is contained in:
committed by
Qt by Nokia
parent
472e486c3a
commit
80f75f093c
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -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
|
||||
|
||||
@@ -240,6 +240,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
|
||||
qtsystems
|
||||
qttools
|
||||
qttranslations
|
||||
qtwayland
|
||||
qtwebkit-examples-and-demos
|
||||
qtxmlpatterns
|
||||
);
|
||||
|
||||
7
qt.pro
7
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 \
|
||||
|
||||
1
qtwayland
Submodule
1
qtwayland
Submodule
Submodule qtwayland added at 70d90b989e
Reference in New Issue
Block a user