summaryrefslogtreecommitdiffstats
path: root/qt.pro
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-06-19 18:34:38 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-29 03:41:39 +0200
commit7c0959338e4ac385a5b23c5be2ab5972994ac4ca (patch)
treece4abeaeab123faa610f4627b9a5f10dff51e5e3 /qt.pro
parentcf26eb0812d183fdb731bcf5526083a3fd8ed81a (diff)
webkit-examples depends on qttools (uitools)
Change-Id: I4e94785003feedd7db904eec659bb5794a7b433b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'qt.pro')
-rw-r--r--qt.pro13
1 files changed, 7 insertions, 6 deletions
diff --git a/qt.pro b/qt.pro
index dcca1b74..b5a4bc01 100644
--- a/qt.pro
+++ b/qt.pro
@@ -38,7 +38,7 @@ QMAKE_EXTRA_TARGETS += module_qtwebkit_target
module_qtwebkit_examples_and_demos.subdir = qtwebkit-examples-and-demos
module_qtwebkit_examples_and_demos.target = module-qtwebkit-examples-and-demos
-module_qtwebkit_examples_and_demos.depends = module_qtwebkit
+module_qtwebkit_examples_and_demos.depends = module_qtwebkit module_qttools
module_qttools.subdir = qttools
module_qttools.target = module-qttools
@@ -179,19 +179,20 @@ exists(qtfeedback/qtfeedback.pro): SUBDIRS += module_qtfeedback
exists(qtdocgallery/qtdocgallery.pro): SUBDIRS += module_qtdocgallery
exists(qtpim/qtpim.pro): SUBDIRS += module_qtpim
exists(qtconnectivity/qtconnectivity.pro): SUBDIRS += module_qtconnectivity
-exists(qtwebkit/Tools/Scripts/build-webkit) {
- SUBDIRS += module_qtwebkit \
- module_qtwebkit_examples_and_demos
- module_qttools.depends += module_qtwebkit
-}
exists(qtactiveqt/qtactiveqt.pro) {
SUBDIRS += module_qtactiveqt
module_qttools.depends += module_qtactiveqt
}
+exists(qtwebkit/WebKit.pro) {
+ SUBDIRS += module_qtwebkit
+ module_qttools.depends += module_qtwebkit
+}
exists(qttools/qttools.pro) {
SUBDIRS += module_qttools
module_qtquick1.depends += module_qttools
}
+exists(qtwebkit/WebKit.pro):exists(qtwebkit-examples-and-demos/qtwebkit-examples-and-demos.pro): \
+ SUBDIRS += module_qtwebkit_examples_and_demos
exists(qtquick1/qtquick1.pro): SUBDIRS += module_qtquick1
!win32:!mac:exists(qtwayland/qtwayland.pro): SUBDIRS += module_qtwayland
exists(qtimageformats/qtimageformats.pro): SUBDIRS += module_qtimageformats