.: [Qt] Don't build the tests in packages, only the launcher(s)
authorhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 27 Jan 2010 16:06:44 +0000 (16:06 +0000)
committerhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 27 Jan 2010 16:06:44 +0000 (16:06 +0000)
Reviewed by Kenneth Rohde Christiansen.

* WebKit.pro:

WebCore: [Qt] For package builds use the .def files on Symbian

Reviewed by Kenneth Rohde Christiansen.

* WebCore.pro:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@53935 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
WebCore/ChangeLog
WebCore/WebCore.pro
WebKit.pro

index 646808c..25066c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-27  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Don't build the tests in packages, only the launcher(s)
+
+        * WebKit.pro:
+
 2010-01-27  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
 
         Reviewed by Tor Arne Vestbø.
index 505801b..c2ab758 100644 (file)
@@ -1,3 +1,11 @@
+2010-01-27  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] For package builds use the .def files on Symbian
+
+        * WebCore.pro:
+
 2010-01-27  Alexander Pavlov  <apavlov@chromium.org>
 
         Reviewed by Timothy Hatcher.
index 4e12f33..58640db 100644 (file)
@@ -52,6 +52,8 @@ CONFIG(standalone_package) {
 
     PRECOMPILED_HEADER = $$PWD/../WebKit/qt/WebKit_pch.h
     DEFINES *= NDEBUG
+
+    symbian: CONFIG += def_files
 } else {
     isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = generated
     isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = ../JavaScriptCore/generated
index 29a3a8e..f63eaa0 100644 (file)
@@ -6,11 +6,11 @@ include(WebKit.pri)
 SUBDIRS += \
         WebCore \
         WebKitTools/QtLauncher \
-        WebKit/qt/QGVLauncher \
-        WebKit/qt/tests
+        WebKit/qt/QGVLauncher
 
 !CONFIG(standalone_package) {
-    SUBDIRS += JavaScriptCore/jsc.pro
+    SUBDIRS += JavaScriptCore/jsc.pro \
+        WebKit/qt/tests
 
     !symbian: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro