Commit 28faeac4 authored by jocelyn.turcotte@nokia.com's avatar jocelyn.turcotte@nokia.com
Browse files

[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:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55520 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent cc0e0691
2010-03-04 Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
Reviewed by Tor Arne Vestbø.
[Qt] Make the OUTPUT_DIR variable in qmake projects independent of build-webkit's logic.
This also allows shadow builds relying only on qmake to work properly.
* WebKit.pri:
2010-03-03 Fridrich Strba <fridrich.strba@bluewin.ch>
Reviewed by Xan Lopez.
......
2010-03-04 Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
Reviewed by Tor Arne Vestbø.
[Qt] Make the OUTPUT_DIR variable in qmake projects independent of build-webkit's logic.
This also allows shadow builds relying only on qmake to work properly.
* jsc.pro:
* qt/api/QtScript.pro:
* qt/tests/qscriptengine/qscriptengine.pro:
* qt/tests/qscriptvalue/qscriptvalue.pro:
* qt/tests/tests.pri:
2010-03-03 Jedrzej Nowacki <jedrzej.nowacki@nokia.com>
 
Reviewed by Simon Hausmann.
......
......@@ -8,13 +8,13 @@ CONFIG += building-libs
win32-*: CONFIG += console
win32-msvc*: CONFIG += exceptions_off stl_off
isEmpty(OUTPUT_DIR): OUTPUT_DIR= ..
include($$PWD/../WebKit.pri)
CONFIG += link_pkgconfig
QMAKE_RPATHDIR += $$OUTPUT_DIR/lib
isEmpty(OUTPUT_DIR):OUTPUT_DIR=$$PWD/..
CONFIG(debug, debug|release) {
OBJECTS_DIR = obj/debug
} else { # Release
......
......@@ -13,6 +13,7 @@ CONFIG(debug, debug|release) {
OBJECTS_DIR = obj/release
}
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../..
include($$PWD/../../../WebKit.pri)
include($$PWD/../../JavaScriptCore.pri)
......
TEMPLATE = app
TARGET = tst_qscriptengine
QT += testlib
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
include(../tests.pri)
SOURCES += tst_qscriptengine.cpp
......
TEMPLATE = app
TARGET = tst_qscriptvalue
QT += testlib
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
include(../tests.pri)
SOURCES += \
......
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
mac:!static:contains(QT_CONFIG, qt_framework):!CONFIG(webkit_no_framework) {
......
2010-03-04 Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
Reviewed by Tor Arne Vestbø.
[Qt] Make the OUTPUT_DIR variable in qmake projects independent of build-webkit's logic.
This also allows shadow builds relying only on qmake to work properly.
* WebCore.pro:
2010-03-02 Holger Hans Peter Freyther <zecke@selfish.org>
 
Reviewed by Simon Hausmann.
......
......@@ -34,6 +34,7 @@ symbian: {
CONFIG(release, debug|release): QMAKE_CXXFLAGS.ARMCC += -OTime -O3
}
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ..
include($$PWD/../WebKit.pri)
TEMPLATE = lib
......@@ -41,8 +42,6 @@ TARGET = QtWebKit
contains(QT_CONFIG, embedded):CONFIG += embedded
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ..
CONFIG(standalone_package) {
isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/generated
isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = $$PWD/../JavaScriptCore/generated
......
......@@ -6,20 +6,8 @@
CONFIG(QTDIR_build): CONFIG += standalone_package
else:exists($$PWD/WebCore/generated): CONFIG += standalone_package
CONFIG(standalone_package) {
OUTPUT_DIR=$$PWD
}
CONFIG += depend_includepath
isEmpty(OUTPUT_DIR) {
CONFIG(debug, debug|release) {
OUTPUT_DIR=$$PWD/WebKitBuild/Debug
} else { # Release
OUTPUT_DIR=$$PWD/WebKitBuild/Release
}
}
DEFINES += BUILDING_QT__=1
building-libs {
win32-msvc*|win32-icc: INCLUDEPATH += $$PWD/JavaScriptCore/os-win32
......
2010-03-04 Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
Reviewed by Tor Arne Vestbø.
[Qt] Make the OUTPUT_DIR variable in qmake projects independent of build-webkit's logic.
This also allows shadow builds relying only on qmake to work properly.
* 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:
2010-03-02 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
 
Reviewed by Kenneth Rohde Christiansen.
......
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../../..
include(../../tests.pri)
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../../..
include(../../tests.pri)
\ No newline at end of file
# -------------------------------------------------
# Project created by QtCreator 2009-12-10T11:25:02
# -------------------------------------------------
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
include(../tests.pri)
TARGET = hybridPixmap
SOURCES += widget.cpp
......
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
include(../tests.pri)
\ No newline at end of file
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
include(../tests.pri)
\ No newline at end of file
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
include(../tests.pri)
\ No newline at end of file
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
include(../tests.pri)
\ No newline at end of file
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
include(../tests.pri)
\ No newline at end of file
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
include(../tests.pri)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment