whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Qt3Support code from QSharedPointer autotest 

Change-Id: I1bb3752e3a5101e4a2990d0cac01406e6023ee2e
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
bb10
Jason McDonald 2011-05-17 13:56:55 +10:00
parent f075a7afec
commit cb1be7a4f6
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/qsharedpointer/externaltests.cpp
View File

@ -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)

13
tests/auto/qsharedpointer/externaltests.h
View File

@ -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)