diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-30 01:00:19 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-30 01:00:19 +0200 |
| commit | 07e92611050f78dae93bcd362112efd8efa7b41e (patch) | |
| tree | 6951f77a6344436150c4f83f407e09d946f2c6c3 /tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp | |
| parent | 69e68218e5082166d5c4ab1903fbacde00418a1c (diff) | |
| parent | caa598c843eb27fd0c645e62723fd2d4e3e12f60 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: Iaa438d14357be1bf75bb645cb8d3245947c055b8
Diffstat (limited to 'tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp')
| -rw-r--r-- | tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp index 67e46ad1b3..d2a244b762 100644 --- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp +++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp @@ -2249,7 +2249,7 @@ Q_GLOBAL_STATIC(QLocale, tst_qapp_locale); #if QT_CONFIG(process) Q_GLOBAL_STATIC(QProcess, tst_qapp_process); #endif -#ifndef QT_NO_FILESYSTEMWATCHER +#if QT_CONFIG(filesystemwatcher) Q_GLOBAL_STATIC(QFileSystemWatcher, tst_qapp_fileSystemWatcher); #endif #ifndef QT_NO_SHAREDMEMORY @@ -2274,7 +2274,7 @@ void tst_QApplication::globalStaticObjectDestruction() #if QT_CONFIG(process) QVERIFY(tst_qapp_process()); #endif -#ifndef QT_NO_FILESYSTEMWATCHER +#if QT_CONFIG(filesystemwatcher) QVERIFY(tst_qapp_fileSystemWatcher()); #endif #ifndef QT_NO_SHAREDMEMORY |