diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-05-17 13:56:55 +1000 |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2011-05-19 14:01:23 +1000 |
| commit | cb1be7a4f62f3c6c5c58d0ffb9b26a221ed3532f (patch) | |
| tree | 0d81d35ab52fa5e2df3948b7c69dfd65bc8bf3cf /tests | |
| parent | f075a7afecaf5d4df349417033d0cfe5e72c2649 (diff) | |
Remove Qt3Support code from QSharedPointer autotest
Change-Id: I1bb3752e3a5101e4a2990d0cac01406e6023ee2e
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qsharedpointer/externaltests.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/qsharedpointer/externaltests.h | 13 |
2 files changed, 6 insertions, 11 deletions
diff --git a/tests/auto/qsharedpointer/externaltests.cpp b/tests/auto/qsharedpointer/externaltests.cpp index b0490c9e59..9999d9a9bc 100644 --- a/tests/auto/qsharedpointer/externaltests.cpp +++ b/tests/auto/qsharedpointer/externaltests.cpp @@ -371,8 +371,6 @@ namespace QTest { sourceCode += "#include <QtOpenGL/QtOpenGL>\n"; if (qtModules & QExternalTest::QtSql) sourceCode += "#include <QtSql/QtSql>\n"; - if (qtModules & QExternalTest::Qt3Support) - sourceCode += "#include <Qt3Support/Qt3Support>\n"; if (qtModules & QExternalTest::QtSvg) sourceCode += "#include <QtSvg/QtSvg>\n"; if (qtModules & QExternalTest::QtScript) @@ -543,8 +541,6 @@ namespace QTest { projectFile.write("QT += opengl\n"); if (qtModules & QExternalTest::QtSql) projectFile.write("QT += sql\n"); - if (qtModules & QExternalTest::Qt3Support) - projectFile.write("QT += qt3support\n"); if (qtModules & QExternalTest::QtSvg) projectFile.write("QT += svg\n"); if (qtModules & QExternalTest::QtScript) diff --git a/tests/auto/qsharedpointer/externaltests.h b/tests/auto/qsharedpointer/externaltests.h index ca20cb0c30..1bf642abb6 100644 --- a/tests/auto/qsharedpointer/externaltests.h +++ b/tests/auto/qsharedpointer/externaltests.h @@ -72,13 +72,12 @@ namespace QTest { QtXmlPatterns=0x0010, QtOpenGL = 0x0020, QtSql = 0x0040, - Qt3Support = 0x0080, - QtSvg = 0x0100, - QtScript = 0x0200, - QtTest = 0x0400, - QtDBus = 0x0800, - QtWebKit = 0x1000, - Phonon = 0x2000 // odd man out + QtSvg = 0x0080, + QtScript = 0x0100, + QtTest = 0x0200, + QtDBus = 0x0400, + QtWebKit = 0x0800, + Phonon = 0x1000 // odd man out }; Q_DECLARE_FLAGS(QtModules, QtModule) |