diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2012-11-26 12:22:45 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-26 14:16:44 +0100 |
commit | 12702d2b12f1a30b587d8d701d0ce37aac516f5d (patch) | |
tree | 204caa1c25b9e22572684a063bd0d933e3770f9c /tests | |
parent | 8e7135c8946b7532c672d21e388176a5f5f5c803 (diff) |
tst_QSharedPointer: update application types
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>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/corelib/tools/qsharedpointer/externaltests.cpp | 16 | ||||
-rw-r--r-- | tests/auto/corelib/tools/qsharedpointer/externaltests.h | 8 |
2 files changed, 11 insertions, 13 deletions
diff --git a/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp b/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp index c229441839..a1c54b5ecd 100644 --- a/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp +++ b/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp @@ -386,23 +386,21 @@ namespace QTest { " QCoreApplication app(argc, argv);\n"; break; - case QExternalTest::QApplicationTty: - sourceCode += - " QApplication app(argc, argv, QApplication::Tty);\n"; - break; - guiapplication: - case QExternalTest::QApplicationGuiClient: + case QExternalTest::QGuiApplication: sourceCode += - " QApplication app(argc, argv, QApplication::GuiClient);\n"; + " QGuiApplication app(argc, argv);\n"; break; - case QExternalTest::QApplicationGuiServer: + widgetsapplication: + case QExternalTest::QApplication: sourceCode += - " QApplication app(argc, argv, QApplication::GuiServer);\n"; + " QApplication app(argc, argv);\n"; break; case QExternalTest::AutoApplication: + if (qtModules & QExternalTest::QtWidgets) + goto widgetsapplication; if (qtModules & QExternalTest::QtGui) goto guiapplication; if (qtModules == 0) diff --git a/tests/auto/corelib/tools/qsharedpointer/externaltests.h b/tests/auto/corelib/tools/qsharedpointer/externaltests.h index 0e3af6628f..7f64d73946 100644 --- a/tests/auto/corelib/tools/qsharedpointer/externaltests.h +++ b/tests/auto/corelib/tools/qsharedpointer/externaltests.h @@ -77,7 +77,8 @@ namespace QTest { QtTest = 0x0200, QtDBus = 0x0400, QtWebKit = 0x0800, - Phonon = 0x1000 // odd man out + QtWidgets = 0x1000, + Phonon = 0x2000 // odd man out }; Q_DECLARE_FLAGS(QtModules, QtModule) @@ -85,9 +86,8 @@ namespace QTest { AutoApplication, Applicationless, QCoreApplication, - QApplicationTty, - QApplicationGuiClient, - QApplicationGuiServer + QGuiApplication, + QApplication }; QList<QByteArray> qmakeSettings() const; |