Context Navigation

← Previous Changeset
Next Changeset →

Changeset 58096 in webkit

Timestamp:

Apr 22, 2010 7:56:10 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-22 Jocelyn Turcotte <jocelyn.turcotte@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Fix autotests .qrc file paths when built in Qt.

Compiling auto-tests from qt/tests/auto/qweb* produced
failing tests since these .pro files include the
ones in WebKit/qt/tests and the .qrc file was
not added to RESOURCES

tests/benchmarks/loading/loading.pro:
tests/benchmarks/painting/painting.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:
tests/qwebview/qwebview.pro:
tests/tests.pri:

Location:

trunk/WebKit/qt

Files:

: 13 edited

ChangeLog (modified) (1 diff)
tests/benchmarks/loading/loading.pro (modified) (1 diff)
tests/benchmarks/painting/painting.pro (modified) (1 diff)
tests/qgraphicswebview/qgraphicswebview.pro (modified) (1 diff)
tests/qwebelement/qwebelement.pro (modified) (1 diff)
tests/qwebframe/qwebframe.pro (modified) (1 diff)
tests/qwebhistory/qwebhistory.pro (modified) (1 diff)
tests/qwebhistoryinterface/qwebhistoryinterface.pro (modified) (1 diff)
tests/qwebinspector/qwebinspector.pro (modified) (1 diff)
tests/qwebpage/qwebpage.pro (modified) (1 diff)
tests/qwebplugindatabase/qwebplugindatabase.pro (modified) (1 diff)
tests/qwebview/qwebview.pro (modified) (1 diff)
tests/tests.pri (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

trunk/WebKit/qt/ChangeLog

-                      r58072
+                      r58096
+-04-22  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Fix autotests .qrc file paths when built in Qt.
+        Compiling auto-tests from qt/tests/auto/qweb* produced
+        failing tests since these .pro files include the
+        ones in WebKit/qt/tests and the .qrc file was
+        not added to RESOURCES
+        * tests/benchmarks/loading/loading.pro:
+        * tests/benchmarks/painting/painting.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:
+        * tests/qwebview/qwebview.pro:
+        * tests/tests.pri:
 -04-22  Adam Barth  <abarth@webkit.org>

trunk/WebKit/qt/tests/benchmarks/loading/loading.pro

r55520	r58096
1	1	isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../../..
2	2	include(../../tests.pri)
	3	exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc

trunk/WebKit/qt/tests/benchmarks/painting/painting.pro

r55520	r58096
1	1	isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../../..
2	2	include(../../tests.pri)
	3	exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc

trunk/WebKit/qt/tests/qgraphicswebview/qgraphicswebview.pro

r55520	r58096
1	1	isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
2	2	include(../tests.pri)
	3	exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc

trunk/WebKit/qt/tests/qwebelement/qwebelement.pro

r55520	r58096
1	1	isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
2	2	include(../tests.pri)
	3	exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc

trunk/WebKit/qt/tests/qwebframe/qwebframe.pro

r55520	r58096
1	1	isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
2	2	include(../tests.pri)
	3	exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc

trunk/WebKit/qt/tests/qwebhistory/qwebhistory.pro

r55520	r58096
1	1	isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
2	2	include(../tests.pri)
	3	exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc

trunk/WebKit/qt/tests/qwebhistoryinterface/qwebhistoryinterface.pro

r55520	r58096
1	1	isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
2	2	include(../tests.pri)
	3	exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc

trunk/WebKit/qt/tests/qwebinspector/qwebinspector.pro

r55520	r58096
1	1	isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
2	2	include(../tests.pri)
	3	exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc

trunk/WebKit/qt/tests/qwebpage/qwebpage.pro

r55520	r58096
1	1	isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
2	2	include(../tests.pri)
	3	exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc

trunk/WebKit/qt/tests/qwebplugindatabase/qwebplugindatabase.pro

r55520	r58096
1	1	isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
2	2	include(../tests.pri)
	3	exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc

trunk/WebKit/qt/tests/qwebview/qwebview.pro

r52444	r58096
	1	isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
1	2	include(../tests.pri)
	3	exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc

trunk/WebKit/qt/tests/tests.pri

-                      r56721
+                      r58096
 VPATH += $$_PRO_FILE_PWD_
+# Add the tst_ prefix, In QTDIR_build it's done by qttest_p4.prf
 !CONFIG(QTDIR_build):TARGET = tst_$$TARGET
 SOURCES += $${TARGET}.cpp
 …
     $$PWD \
     $$PWD/../Api
-exists($$_PRO_FILE_PWD_/$${TARGET}.qrc):RESOURCES += $$_PRO_FILE_PWD_/$${TARGET}.qrc
 include(../../../WebKit.pri)

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 58096 in webkit

Legend:

Download in other formats: