diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2010-04-13 12:20:06 (GMT) |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2010-04-13 12:21:20 (GMT) |
| commit | f05452a7ed2b93978116e7afdf82acfbe541628e (patch) | |
| tree | 4d21bc74b5156f3e814b845e2d5d70aeda72b193 | |
| parent | ebc7e35bd287a18c7f44d75a056dbc06172ef146 (diff) | |
| download | Qt-f05452a7ed2b93978116e7afdf82acfbe541628e.zip Qt-f05452a7ed2b93978116e7afdf82acfbe541628e.tar.gz Qt-f05452a7ed2b93978116e7afdf82acfbe541628e.tar.bz2 | |
QtWebKit: Fix autotests .qrc file paths when built from tests/auto/qweb*
Reviewed-by: TrustMe
12 files changed, 20 insertions, 10 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/tests/benchmarks/loading/loading.pro b/src/3rdparty/webkit/WebKit/qt/tests/benchmarks/loading/loading.pro index 024211f..258930c 100644 --- a/src/3rdparty/webkit/WebKit/qt/tests/benchmarks/loading/loading.pro +++ b/src/3rdparty/webkit/WebKit/qt/tests/benchmarks/loading/loading.pro @@ -1,2 +1,3 @@ isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../../.. +exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc include(../../tests.pri) diff --git a/src/3rdparty/webkit/WebKit/qt/tests/benchmarks/painting/painting.pro b/src/3rdparty/webkit/WebKit/qt/tests/benchmarks/painting/painting.pro index b4fc56a..258930c 100644 --- a/src/3rdparty/webkit/WebKit/qt/tests/benchmarks/painting/painting.pro +++ b/src/3rdparty/webkit/WebKit/qt/tests/benchmarks/painting/painting.pro @@ -1,2 +1,3 @@ isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../../.. -include(../../tests.pri)
\ No newline at end of file +exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc +include(../../tests.pri) diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qgraphicswebview/qgraphicswebview.pro b/src/3rdparty/webkit/WebKit/qt/tests/qgraphicswebview/qgraphicswebview.pro index d056014..6777615 100644 --- a/src/3rdparty/webkit/WebKit/qt/tests/qgraphicswebview/qgraphicswebview.pro +++ b/src/3rdparty/webkit/WebKit/qt/tests/qgraphicswebview/qgraphicswebview.pro @@ -1,2 +1,3 @@ isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../.. -include(../tests.pri)
\ No newline at end of file +exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc +include(../tests.pri) diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebelement/qwebelement.pro b/src/3rdparty/webkit/WebKit/qt/tests/qwebelement/qwebelement.pro index d056014..6777615 100644 --- a/src/3rdparty/webkit/WebKit/qt/tests/qwebelement/qwebelement.pro +++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebelement/qwebelement.pro @@ -1,2 +1,3 @@ isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../.. -include(../tests.pri)
\ No newline at end of file +exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc +include(../tests.pri) diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/qwebframe.pro b/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/qwebframe.pro index d056014..6777615 100644 --- a/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/qwebframe.pro +++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/qwebframe.pro @@ -1,2 +1,3 @@ isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../.. -include(../tests.pri)
\ No newline at end of file +exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc +include(../tests.pri) diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebhistory/qwebhistory.pro b/src/3rdparty/webkit/WebKit/qt/tests/qwebhistory/qwebhistory.pro index d056014..6777615 100644 --- a/src/3rdparty/webkit/WebKit/qt/tests/qwebhistory/qwebhistory.pro +++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebhistory/qwebhistory.pro @@ -1,2 +1,3 @@ isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../.. -include(../tests.pri)
\ No newline at end of file +exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc +include(../tests.pri) diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebhistoryinterface/qwebhistoryinterface.pro b/src/3rdparty/webkit/WebKit/qt/tests/qwebhistoryinterface/qwebhistoryinterface.pro index d056014..6777615 100644 --- a/src/3rdparty/webkit/WebKit/qt/tests/qwebhistoryinterface/qwebhistoryinterface.pro +++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebhistoryinterface/qwebhistoryinterface.pro @@ -1,2 +1,3 @@ isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../.. -include(../tests.pri)
\ No newline at end of file +exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc +include(../tests.pri) diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebinspector/qwebinspector.pro b/src/3rdparty/webkit/WebKit/qt/tests/qwebinspector/qwebinspector.pro index ac51929..6777615 100644 --- a/src/3rdparty/webkit/WebKit/qt/tests/qwebinspector/qwebinspector.pro +++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebinspector/qwebinspector.pro @@ -1,2 +1,3 @@ isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../.. +exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc include(../tests.pri) diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/qwebpage.pro b/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/qwebpage.pro index d056014..6777615 100644 --- a/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/qwebpage.pro +++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/qwebpage.pro @@ -1,2 +1,3 @@ isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../.. -include(../tests.pri)
\ No newline at end of file +exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc +include(../tests.pri) diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebplugindatabase/qwebplugindatabase.pro b/src/3rdparty/webkit/WebKit/qt/tests/qwebplugindatabase/qwebplugindatabase.pro index ac51929..6777615 100644 --- a/src/3rdparty/webkit/WebKit/qt/tests/qwebplugindatabase/qwebplugindatabase.pro +++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebplugindatabase/qwebplugindatabase.pro @@ -1,2 +1,3 @@ isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../.. +exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc include(../tests.pri) diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebview/qwebview.pro b/src/3rdparty/webkit/WebKit/qt/tests/qwebview/qwebview.pro index 4ca2bf6..6777615 100644 --- a/src/3rdparty/webkit/WebKit/qt/tests/qwebview/qwebview.pro +++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebview/qwebview.pro @@ -1 +1,3 @@ -include(../tests.pri)
\ No newline at end of file +isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../.. +exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc +include(../tests.pri) diff --git a/src/3rdparty/webkit/WebKit/qt/tests/tests.pri b/src/3rdparty/webkit/WebKit/qt/tests/tests.pri index 0bdf6f6..0a8f98c 100644 --- a/src/3rdparty/webkit/WebKit/qt/tests/tests.pri +++ b/src/3rdparty/webkit/WebKit/qt/tests/tests.pri @@ -8,8 +8,6 @@ INCLUDEPATH += \ $$PWD \ $$PWD/../Api -exists($$_PRO_FILE_PWD_/$${TARGET}.qrc):RESOURCES += $$_PRO_FILE_PWD_/$${TARGET}.qrc - include(../../../WebKit.pri) QT += testlib network |