summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebKit/qt/tests/qwebframe
diff options
context:
space:
mode:
authorLiang QI <liang.qi@nokia.com>2009-11-03 11:05:50 (GMT)
committerJocelyn Turcotte <jocelyn.turcotte@nokia.com>2009-11-10 09:30:24 (GMT)
commit5786450e3078c6b24f92859349fcd4231426e62d (patch)
tree120b2b633c3d672baeef1fead970a7776638e466 /src/3rdparty/webkit/WebKit/qt/tests/qwebframe
parentd15d7385cb6cfb453ab08d6d7154b66c3fb087ee (diff)
downloadQt-5786450e3078c6b24f92859349fcd4231426e62d.zip
Qt-5786450e3078c6b24f92859349fcd4231426e62d.tar.gz
Qt-5786450e3078c6b24f92859349fcd4231426e62d.tar.bz2
Re-apply change 29afcb69d6023aba012051bd2a026b57b3689732 by Liang QI
Re-apply change 1db4a133a9d35e00bad50541fb8d64079a7debea by Liang QI Fix tst_qwebpage and tst_qwebframe compilation on Symbian. RevBy: TrustMe
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/tests/qwebframe')
-rw-r--r--src/3rdparty/webkit/WebKit/qt/tests/qwebframe/qwebframe.pro2
-rw-r--r--src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/qwebframe.pro b/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/qwebframe.pro
index 0e540e5..b8734cd 100644
--- a/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/qwebframe.pro
+++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/qwebframe.pro
@@ -5,7 +5,7 @@ SOURCES += tst_qwebframe.cpp
RESOURCES += qwebframe.qrc
QT += testlib network
QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
-DEFINES += SRCDIR=\\\"$$PWD/resources\\\"
+!symbian:DEFINES += SRCDIR=\\\"$$PWD/resources\\\"
symbian {
TARGET.UID3 = 0xA000E53D
diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp b/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
index 7cc62b0..6f07e90 100644
--- a/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
@@ -38,6 +38,10 @@
#endif
#include "../util.h"
+#if defined(Q_OS_SYMBIAN)
+# define SRCDIR ""
+#endif
+
//TESTED_CLASS=
//TESTED_FILES=