1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_QSharedPointer: update application types

Browse Source 
QCoreApplication::Type enum was removed in 553e21. This change updates
the (un)tested application types to match the application types
available in Qt 5.

Change-Id: I8631987a9ff31dc81baa013619cfc18616b851d1
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
This commit is contained in:
J-P Nurmi 2012-11-26 12:22:45 +01:00 committed by The Qt Project
parent 8e7135c894
commit 12702d2b12
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/auto/corelib/tools/qsharedpointer/externaltests.cpp
View File

@ -386,23 +386,21 @@ namespace QTest {
" QCoreApplication app(argc, argv);\n"; " QCoreApplication app(argc, argv);\n";
break; break;
case QExternalTest::QApplicationTty:
sourceCode +=
" QApplication app(argc, argv, QApplication::Tty);\n";
break;
guiapplication: guiapplication:
case QExternalTest::QApplicationGuiClient: case QExternalTest::QGuiApplication:
sourceCode += sourceCode +=
" QApplication app(argc, argv, QApplication::GuiClient);\n"; " QGuiApplication app(argc, argv);\n";
break; break;
case QExternalTest::QApplicationGuiServer: widgetsapplication:
case QExternalTest::QApplication:
sourceCode += sourceCode +=
" QApplication app(argc, argv, QApplication::GuiServer);\n"; " QApplication app(argc, argv);\n";
break; break;
case QExternalTest::AutoApplication: case QExternalTest::AutoApplication:
if (qtModules & QExternalTest::QtWidgets)
goto widgetsapplication;
if (qtModules & QExternalTest::QtGui) if (qtModules & QExternalTest::QtGui)
goto guiapplication; goto guiapplication;
if (qtModules == 0) if (qtModules == 0)

8
tests/auto/corelib/tools/qsharedpointer/externaltests.h
View File

@ -77,7 +77,8 @@ namespace QTest {
QtTest = 0x0200, QtTest = 0x0200,
QtDBus = 0x0400, QtDBus = 0x0400,
QtWebKit = 0x0800, QtWebKit = 0x0800,
Phonon = 0x1000 // odd man out QtWidgets = 0x1000,
Phonon = 0x2000 // odd man out
}; };
Q_DECLARE_FLAGS(QtModules, QtModule) Q_DECLARE_FLAGS(QtModules, QtModule)
@ -85,9 +86,8 @@ namespace QTest {
AutoApplication, AutoApplication,
Applicationless, Applicationless,
QCoreApplication, QCoreApplication,
QApplicationTty, QGuiApplication,
QApplicationGuiClient, QApplication
QApplicationGuiServer
}; };
QList<QByteArray> qmakeSettings() const; QList<QByteArray> qmakeSettings() const;