From e129d300b301258c95984ec73446e7ba683fe683 Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Thu, 28 Apr 2011 10:07:48 +0200
Subject: Avoided running the build-webkit script if it has not been cloned.

Reviewed by: Olivier Goffart
---
 qt.pro | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'qt.pro')

diff --git a/qt.pro b/qt.pro
index bd46c55a..f9c10cb4 100644
--- a/qt.pro
+++ b/qt.pro
@@ -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
-- 
cgit v1.2.3