Disable tests uncompatible with Qt4 for that build

test/CMakeLists.txt

@@ -9,7 +9,6 @@ setup_qt()
 include(owncloud_add_test.cmake)
 
 owncloud_add_test(OwncloudPropagator "")
-owncloud_add_test(Utility "")
 owncloud_add_test(Updater "")
 
 SET(FolderWatcher_SRC ../src/gui/folderwatcher.cpp)
@@ -24,31 +23,29 @@ IF( APPLE )
 list(APPEND FolderWatcher_SRC ../src/gui/folderwatcher_mac.cpp)
 list(APPEND FolderWatcher_SRC ../src/gui/socketapisocket_mac.mm)
 ENDIF()
-
-owncloud_add_test(FolderWatcher "${FolderWatcher_SRC}")
-if( UNIX AND NOT APPLE )
-  if(HAVE_QT5 AND NOT BUILD_WITH_QT4)
-    owncloud_add_test(InotifyWatcher "${FolderWatcher_SRC}")
-  endif(HAVE_QT5 AND NOT BUILD_WITH_QT4)
-endif(UNIX AND NOT APPLE)
-
 owncloud_add_test(CSyncSqlite "")
 owncloud_add_test(NetrcParser ../src/cmd/netrcparser.cpp)
 owncloud_add_test(OwnSql "")
 owncloud_add_test(SyncJournalDB "")
 owncloud_add_test(SyncFileItem "")
 owncloud_add_test(ConcatUrl "")
-
 owncloud_add_test(XmlParse "")
-owncloud_add_test(FileSystem "")
 owncloud_add_test(ChecksumValidator "")
 
 owncloud_add_test(ExcludedFiles "")
 if(HAVE_QT5 AND NOT BUILD_WITH_QT4)
+    owncloud_add_test(FileSystem "")
+    owncloud_add_test(Utility "")
     owncloud_add_test(SyncEngine "syncenginetestutils.h")
     owncloud_add_test(SyncFileStatusTracker "syncenginetestutils.h")
     owncloud_add_test(ChunkingNg "syncenginetestutils.h")
     owncloud_add_test(UploadReset "syncenginetestutils.h")
+    owncloud_add_test(FolderWatcher "${FolderWatcher_SRC}")
+
+    if( UNIX AND NOT APPLE )
+        owncloud_add_test(InotifyWatcher "${FolderWatcher_SRC}")
+    endif(UNIX AND NOT APPLE)
+
     owncloud_add_benchmark(LargeSync "syncenginetestutils.h")
 endif(HAVE_QT5 AND NOT BUILD_WITH_QT4)
 
@@ -60,8 +57,5 @@ list(APPEND FolderMan_SRC ../src/gui/syncrunfilelog.cpp )
 list(APPEND FolderMan_SRC ../src/gui/lockwatcher.cpp )
 list(APPEND FolderMan_SRC ${FolderWatcher_SRC})
 list(APPEND FolderMan_SRC stub.cpp )
-#include_directories(${QTKEYCHAIN_INCLUDE_DIR})
-#include_directories(${CMAKE_BINARY_DIR}/src/gui)
-#include_directories(${CMAKE_SOURCE_DIR}/src/3rdparty/qjson)
 owncloud_add_test(FolderMan "${FolderMan_SRC}")
 

test/testfolderwatcher.cpp

@@ -183,15 +183,7 @@ private slots:
     }
 };
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-// Qt4 does not have QTEST_GUILESS_MAIN, so we simulate it.
-int main(int argc, char *argv[])
-{
-    QCoreApplication app(argc, argv);
-    TestFolderWatcher tc;
-    return QTest::qExec(&tc, argc, argv);
-}
-#elif defined(Q_OS_MAC)
+#ifdef Q_OS_MAC
     QTEST_MAIN(TestFolderWatcher)
 #else
     QTEST_GUILESS_MAIN(TestFolderWatcher)