diff options
author | axis <qt-info@nokia.com> | 2011-04-28 10:07:48 +0200 |
---|---|---|
committer | axis <qt-info@nokia.com> | 2011-04-28 10:21:00 +0200 |
commit | e129d300b301258c95984ec73446e7ba683fe683 (patch) | |
tree | 8bb60f9e1696715d463dde97620b56f88e2b67a8 /qt.pro | |
parent | 519c2294b2c20c33e4675e822360e61ab3c481f5 (diff) |
Avoided running the build-webkit script if it has not been cloned.
Reviewed by: Olivier Goffart
Diffstat (limited to 'qt.pro')
-rw-r--r-- | qt.pro | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -46,7 +46,7 @@ qtwebkit_examples_and_demos.depends = module_qtwebkit module_qttools.subdir = $$IN_PWD/qttools module_qttools.target = module-qttools -module_qttools.depends = module_qtbase module_qtscript module_qtdeclarative module_qt3support module_qtwebkit +module_qttools.depends = module_qtbase module_qtscript module_qtdeclarative module_qt3support win32:module_qttools.depends += module_activeqt module_qttranslations.subdir = $$IN_PWD/qttranslations @@ -70,11 +70,14 @@ SUBDIRS = \ module_qtscript \ module_qtdeclarative \ module_qt3support \ - module_qtwebkit \ module_qtmultimedia \ module_qttools \ module_qttranslations \ module_qtdoc \ - qtwebkit_examples_and_demos \ +exists(qtwebkit/Tools/Scripts/build-webkit) { + SUBDIRS += module_qtwebkit \ + qtwebkit_examples_and_demos + module_qttools.depends += module_qtwebkit +} win32:SUBDIRS += module_activeqt |