diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qwebelement/qwebelement.pro | 2 | ||||
-rw-r--r-- | tests/auto/qwebframe/qwebframe.pro | 2 | ||||
-rw-r--r-- | tests/auto/qwebhistory/qwebhistory.pro | 2 | ||||
-rw-r--r-- | tests/auto/qwebhistoryinterface/qwebhistoryinterface.pro | 2 | ||||
-rw-r--r-- | tests/auto/qwebpage/qwebpage.pro | 2 | ||||
-rw-r--r-- | tests/auto/symbols/tst_symbols.cpp | 5 |
6 files changed, 9 insertions, 6 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 { diff --git a/tests/auto/symbols/tst_symbols.cpp b/tests/auto/symbols/tst_symbols.cpp index d2c8c24..00486d2 100644 --- a/tests/auto/symbols/tst_symbols.cpp +++ b/tests/auto/symbols/tst_symbols.cpp @@ -264,6 +264,9 @@ void tst_Symbols::prefix() excusedPrefixes["QtSql"] = QStringList() << "sqlite3"; + excusedPrefixes["QtScript"] = + QStringList() << "QTJSC"; + excusedPrefixes["QtWebKit"] = QStringList() << "WebCore::" << "KJS::" @@ -294,7 +297,7 @@ void tst_Symbols::prefix() bool isFailed = false; foreach (QString lib, files) { - if (lib.contains("Designer") || lib.contains("QtCLucene") || lib.contains("XmlPatternsSDK")) + if (lib.contains("Designer") || lib.contains("QtCLucene") || lib.contains("XmlPatternsSDK") || lib.contains("WebKit")) continue; bool isPhonon = lib.contains("phonon"); |