Make tst_qapplication build when QT_NO_SHAREDMEMORY is defined
authorKevin Krammer <kevin.krammer.qnx@kdab.com>
Fri, 9 Mar 2012 11:56:41 +0000 (12:56 +0100)
committerQt by Nokia <qt-info@nokia.com>
Fri, 9 Mar 2012 15:54:27 +0000 (16:54 +0100)
Change-Id: I8cfd0ff2e17e6d5c04b81a042c665bcbbca36256
Reviewed-by: David Faure <faure@kde.org>
tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp

index 9bbb6aa..91ecbf2 100644 (file)
@@ -2160,7 +2160,9 @@ void tst_QApplication::abortQuitOnShow()
 Q_GLOBAL_STATIC(QLocale, tst_qapp_locale);
 Q_GLOBAL_STATIC(QProcess, tst_qapp_process);
 Q_GLOBAL_STATIC(QFileSystemWatcher, tst_qapp_fileSystemWatcher);
+#ifndef QT_NO_SHAREDMEMORY
 Q_GLOBAL_STATIC(QSharedMemory, tst_qapp_sharedMemory);
+#endif
 Q_GLOBAL_STATIC(QElapsedTimer, tst_qapp_elapsedTimer);
 Q_GLOBAL_STATIC(QMutex, tst_qapp_mutex);
 Q_GLOBAL_STATIC(QWidget, tst_qapp_widget);
@@ -2177,7 +2179,9 @@ void tst_QApplication::globalStaticObjectDestruction()
     QVERIFY(tst_qapp_locale());
     QVERIFY(tst_qapp_process());
     QVERIFY(tst_qapp_fileSystemWatcher());
+#ifndef QT_NO_SHAREDMEMORY
     QVERIFY(tst_qapp_sharedMemory());
+#endif
     QVERIFY(tst_qapp_elapsedTimer());
     QVERIFY(tst_qapp_mutex());
     QVERIFY(tst_qapp_widget());