Changeset 55520 in webkit for trunk/JavaScriptCore/qt/tests

Timestamp:

Mar 4, 2010, 5:39:45 AM (15 years ago)

Author:

[email protected]

Message:

[Qt] Make the OUTPUT_DIR variable in qmake projects independent of build-webkit's logic.

Reviewed by Tor Arne Vestbø.

This also allows shadow builds relying only on qmake to work properly.

.:

• WebKit.pri:

JavaScriptCore:

• jsc.pro:
• qt/api/QtScript.pro:
• qt/tests/qscriptengine/qscriptengine.pro:
• qt/tests/qscriptvalue/qscriptvalue.pro:
• qt/tests/tests.pri:

WebCore:

• WebCore.pro:

WebKit\qt:

• tests/benchmarks/loading/loading.pro:
• tests/benchmarks/painting/painting.pro:
• tests/hybridPixmap/hybridPixmap.pro:
• tests/qgraphicswebview/qgraphicswebview.pro:
• tests/qwebelement/qwebelement.pro:
• tests/qwebframe/qwebframe.pro:
• tests/qwebhistory/qwebhistory.pro:
• tests/qwebhistoryinterface/qwebhistoryinterface.pro:
• tests/qwebinspector/qwebinspector.pro:
• tests/qwebpage/qwebpage.pro:
• tests/qwebplugindatabase/qwebplugindatabase.pro:

WebKitTools:

• DumpRenderTree/qt/DumpRenderTree.pro:
• DumpRenderTree/qt/ImageDiff.pro:
• DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro:
• QtLauncher/QtLauncher.pro:

Location:

trunk/JavaScriptCore/qt/tests

Files:

• qscriptengine/qscriptengine.pro (modified) (1 diff)
• qscriptvalue/qscriptvalue.pro (modified) (1 diff)
• tests.pri (modified) (1 diff)

trunk/JavaScriptCore/qt/tests/qscriptengine/qscriptengine.pro

@@ -2 +2 @@
 TARGET = tst_qscriptengine
 QT += testlib
+isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
 include(../tests.pri)
 

trunk/JavaScriptCore/qt/tests/qscriptvalue/qscriptvalue.pro

@@ -2 +2 @@
 TARGET = tst_qscriptvalue
 QT += testlib
+isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
 include(../tests.pri)
 

trunk/JavaScriptCore/qt/tests/tests.pri

@@ -1 @@
-isEmpty(OUTPUT_DIR) {
-    CONFIG(debug, debug|release) {
-        OUTPUT_DIR=$$PWD/WebKitBuild/Debug
-    } else { # Release
-        OUTPUT_DIR=$$PWD/WebKitBuild/Release
-    }
-}
-
-
 QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
 QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR