summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis Menard <alexis.menard@nokia.com>2011-06-28 17:12:37 (GMT)
committerSergio Ahumada <sergio.ahumada@nokia.com>2011-06-28 17:32:14 (GMT)
commit02c0de622fd5f100811ce0ac5fdfd98376571db1 (patch)
treea8e27991390275964bc7a0de68f9d3d15f0a58ca
parentb45158d6e8b7c1a17f4c4465f1b6d7c852c94665 (diff)
downloadQt-02c0de622fd5f100811ce0ac5fdfd98376571db1.zip
Qt-02c0de622fd5f100811ce0ac5fdfd98376571db1.tar.gz
Qt-02c0de622fd5f100811ce0ac5fdfd98376571db1.tar.bz2
Fix the auto-tests of QtWebKit.
The source tree of WebKit was reorganized. The pro files needs to be updated. Reviewed-by:Andreas Kling
-rw-r--r--tests/auto/qwebelement/qwebelement.pro2
-rw-r--r--tests/auto/qwebframe/qwebframe.pro2
-rw-r--r--tests/auto/qwebhistory/qwebhistory.pro2
-rw-r--r--tests/auto/qwebhistoryinterface/qwebhistoryinterface.pro2
-rw-r--r--tests/auto/qwebpage/qwebpage.pro2
5 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/qwebelement/qwebelement.pro b/tests/auto/qwebelement/qwebelement.pro
index ac809b8..b397978 100644
--- a/tests/auto/qwebelement/qwebelement.pro
+++ b/tests/auto/qwebelement/qwebelement.pro
@@ -5,7 +5,7 @@ contains(QT_CONFIG,webkit) {
isEmpty(QT_BUILD_TREE):QT_BUILD_TREE=$(QTDIR)
isEmpty(QT_SOURCE_TREE):QT_SOURCE_TREE=$$fromfile($$QT_BUILD_TREE/.qmake.cache, QT_SOURCE_TREE)
- TESTDIR = $$QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/tests/qwebelement
+ TESTDIR = $$QT_SOURCE_TREE/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebelement
VPATH += $$TESTDIR
include($$TESTDIR/qwebelement.pro)
} else {
diff --git a/tests/auto/qwebframe/qwebframe.pro b/tests/auto/qwebframe/qwebframe.pro
index 1d51f4c..f123103 100644
--- a/tests/auto/qwebframe/qwebframe.pro
+++ b/tests/auto/qwebframe/qwebframe.pro
@@ -5,7 +5,7 @@ contains(QT_CONFIG,webkit) {
isEmpty(QT_BUILD_TREE):QT_BUILD_TREE=$(QTDIR)
isEmpty(QT_SOURCE_TREE):QT_SOURCE_TREE=$$fromfile($$QT_BUILD_TREE/.qmake.cache, QT_SOURCE_TREE)
- TESTDIR = $$QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/tests/qwebframe
+ TESTDIR = $$QT_SOURCE_TREE/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebframe
VPATH += $$TESTDIR
include($$TESTDIR/qwebframe.pro)
} else {
diff --git a/tests/auto/qwebhistory/qwebhistory.pro b/tests/auto/qwebhistory/qwebhistory.pro
index 232f478..7831e24 100644
--- a/tests/auto/qwebhistory/qwebhistory.pro
+++ b/tests/auto/qwebhistory/qwebhistory.pro
@@ -5,7 +5,7 @@ contains(QT_CONFIG,webkit) {
isEmpty(QT_BUILD_TREE):QT_BUILD_TREE=$(QTDIR)
isEmpty(QT_SOURCE_TREE):QT_SOURCE_TREE=$$fromfile($$QT_BUILD_TREE/.qmake.cache, QT_SOURCE_TREE)
- TESTDIR = $$QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/tests/qwebhistory
+ TESTDIR = $$QT_SOURCE_TREE/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebhistory
VPATH += $$TESTDIR
include($$TESTDIR/qwebhistory.pro)
} else {
diff --git a/tests/auto/qwebhistoryinterface/qwebhistoryinterface.pro b/tests/auto/qwebhistoryinterface/qwebhistoryinterface.pro
index 7218f52..4bf9580 100644
--- a/tests/auto/qwebhistoryinterface/qwebhistoryinterface.pro
+++ b/tests/auto/qwebhistoryinterface/qwebhistoryinterface.pro
@@ -5,7 +5,7 @@ contains(QT_CONFIG,webkit) {
isEmpty(QT_BUILD_TREE):QT_BUILD_TREE=$(QTDIR)
isEmpty(QT_SOURCE_TREE):QT_SOURCE_TREE=$$fromfile($$QT_BUILD_TREE/.qmake.cache, QT_SOURCE_TREE)
- TESTDIR = $$QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/tests/qwebhistoryinterface
+ TESTDIR = $$QT_SOURCE_TREE/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebhistoryinterface
VPATH += $$TESTDIR
include($$TESTDIR/qwebhistoryinterface.pro)
} else {
diff --git a/tests/auto/qwebpage/qwebpage.pro b/tests/auto/qwebpage/qwebpage.pro
index 47e3238..8d2b5c0 100644
--- a/tests/auto/qwebpage/qwebpage.pro
+++ b/tests/auto/qwebpage/qwebpage.pro
@@ -5,7 +5,7 @@ contains(QT_CONFIG,webkit) {
isEmpty(QT_BUILD_TREE):QT_BUILD_TREE=$(QTDIR)
isEmpty(QT_SOURCE_TREE):QT_SOURCE_TREE=$$fromfile($$QT_BUILD_TREE/.qmake.cache, QT_SOURCE_TREE)
- TESTDIR = $$QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/tests/qwebpage
+ TESTDIR = $$QT_SOURCE_TREE/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebpage
VPATH += $$TESTDIR
include($$TESTDIR/qwebpage.pro)
} else {