From 02c0de622fd5f100811ce0ac5fdfd98376571db1 Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Tue, 28 Jun 2011 14:12:37 -0300 Subject: Fix the auto-tests of QtWebKit. The source tree of WebKit was reorganized. The pro files needs to be updated. Reviewed-by:Andreas Kling --- tests/auto/qwebelement/qwebelement.pro | 2 +- tests/auto/qwebframe/qwebframe.pro | 2 +- tests/auto/qwebhistory/qwebhistory.pro | 2 +- tests/auto/qwebhistoryinterface/qwebhistoryinterface.pro | 2 +- tests/auto/qwebpage/qwebpage.pro | 2 +- 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 { -- cgit v0.12