Changeset 57198 in webkit

Timestamp:

Apr 7, 2010 1:15:43 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-07 Laszlo Gombos <Laszlo Gombos>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Fix trunk (non-standalone) builds for Symbian
​https://bugs.webkit.org/show_bug.cgi?id=37136

Test for source files before building instead of relying on
standalone_package config.

• WebKit.pro:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• WebKit.pro (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2010-04-07  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Fix trunk (non-standalone) builds for Symbian
+        https://bugs.webkit.org/show_bug.cgi?id=37136
+
+        Test for source files before building instead of relying on
+        standalone_package config.
+
+        * WebKit.pro:
+
 2010-04-01  Kinuko Yasuda  <kinuko@chromium.org>
 

trunk/WebKit.pro

@@ -6 +6 @@
 SUBDIRS += \
         JavaScriptCore \
-        WebCore \
-        WebKitTools/QtLauncher
+        WebCore
 
-!CONFIG(standalone_package) {
-    SUBDIRS += JavaScriptCore/jsc.pro \
-        WebKit/qt/tests \
-        WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
+# If the source exists, built it
+exists($$PWD/WebKitTools/QtLauncher): SUBDIRS += WebKitTools/QtLauncher
+exists($$PWD/JavaScriptCore/jsc.pro): SUBDIRS += JavaScriptCore/jsc.pro
+exists($$PWD/WebKit/qt/tests): SUBDIRS += WebKit/qt/tests
+exists($$PWD/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro): SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
 
-    !win32:!symbian {
-        SUBDIRS += WebKitTools/DumpRenderTree/qt/ImageDiff.pro
-        SUBDIRS += WebKitTools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
-    }
-
+!win32:!symbian {
+    exists($$PWD/WebKitTools/DumpRenderTree/qt/ImageDiff.pro): SUBDIRS += WebKitTools/DumpRenderTree/qt/ImageDiff.pro
+    exists($$PWD/WebKitTools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro): SUBDIRS += WebKitTools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
 }