18 files changed, 33 insertions, 18 deletions
diff --git a/test/owncloud_add_test.cmake b/test/owncloud_add_test.cmake
index f9e5986c6..8406c2dfe 100644
--- a/test/owncloud_add_test.cmake
+++ b/test/owncloud_add_test.cmake
@@ -11,7 +11,7 @@ macro(owncloud_add_test test_class additional_cpp)
     string(TOLOWER "${OWNCLOUD_TEST_CLASS}" OWNCLOUD_TEST_CLASS_LOWERCASE)
 
     add_executable(${OWNCLOUD_TEST_CLASS}Test test${OWNCLOUD_TEST_CLASS_LOWERCASE}.cpp ${additional_cpp})
-    qt5_use_modules(${OWNCLOUD_TEST_CLASS}Test Test Sql Xml Network Gui Widgets)
+    qt5_use_modules(${OWNCLOUD_TEST_CLASS}Test Test Sql Xml Network)
 
     target_link_libraries(${OWNCLOUD_TEST_CLASS}Test
         updater
diff --git a/test/testchecksumvalidator.cpp b/test/testchecksumvalidator.cpp
index 8338c0059..a0fc934c9 100644
--- a/test/testchecksumvalidator.cpp
+++ b/test/testchecksumvalidator.cpp
@@ -150,5 +150,10 @@ using namespace OCC;
     }
 };
 
-QTEST_MAIN(TestChecksumValidator)
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+    QTEST_MAIN(TestChecksumValidator)
+#else
+    QTEST_GUILESS_MAIN(TestChecksumValidator)
+#endif
+
 #include "testchecksumvalidator.moc"
diff --git a/test/testconcaturl.cpp b/test/testconcaturl.cpp
index b38d52643..558344999 100644
--- a/test/testconcaturl.cpp
+++ b/test/testconcaturl.cpp
@@ -100,5 +100,5 @@ private slots:
 
 };
 
-QTEST_MAIN(TestConcatUrl)
+QTEST_APPLESS_MAIN(TestConcatUrl)
 #include "testconcaturl.moc"
diff --git a/test/testcsyncsqlite.cpp b/test/testcsyncsqlite.cpp
index 490f286fb..9d526afee 100644
--- a/test/testcsyncsqlite.cpp
+++ b/test/testcsyncsqlite.cpp
@@ -85,5 +85,5 @@ private slots:
 
 };
 
-QTEST_MAIN(TestCSyncSqlite)
+QTEST_APPLESS_MAIN(TestCSyncSqlite)
 #include "testcsyncsqlite.moc"
diff --git a/test/testexcludedfiles.cpp b/test/testexcludedfiles.cpp
index 21683f991..978e375dd 100644
--- a/test/testexcludedfiles.cpp
+++ b/test/testexcludedfiles.cpp
@@ -46,5 +46,5 @@ private slots:
     }
 };
 
-QTEST_MAIN(TestExcludedFiles)
+QTEST_APPLESS_MAIN(TestExcludedFiles)
 #include "testexcludedfiles.moc"
diff --git a/test/testfilesystem.cpp b/test/testfilesystem.cpp
index 85983bc5a..03ef87332 100644
--- a/test/testfilesystem.cpp
+++ b/test/testfilesystem.cpp
@@ -87,5 +87,5 @@ private slots:
 
 };
 
-QTEST_MAIN(TestFileSystem)
+QTEST_APPLESS_MAIN(TestFileSystem)
 #include "testfilesystem.moc"
diff --git a/test/testfolder.cpp b/test/testfolder.cpp
index 2ed4870c7..e8775ac06 100644
--- a/test/testfolder.cpp
+++ b/test/testfolder.cpp
@@ -41,5 +41,5 @@ private slots:
 
 };
 
-QTEST_MAIN(TestFolder)
+QTEST_APPLESS_MAIN(TestFolder)
 #include "testfolder.moc"
diff --git a/test/testfolderman.cpp b/test/testfolderman.cpp
index 47e115da0..7b1c3cc5b 100644
--- a/test/testfolderman.cpp
+++ b/test/testfolderman.cpp
@@ -118,5 +118,5 @@ private slots:
     }
 };
 
-QTEST_MAIN(TestFolderMan)
+QTEST_APPLESS_MAIN(TestFolderMan)
 #include "testfolderman.moc"
diff --git a/test/testfolderwatcher.cpp b/test/testfolderwatcher.cpp
index 9ce4eb7d0..e2b8eb423 100644
--- a/test/testfolderwatcher.cpp
+++ b/test/testfolderwatcher.cpp
@@ -170,5 +170,10 @@ private slots:
     }
 };
 
-QTEST_MAIN(TestFolderWatcher)
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+    QTEST_MAIN(TestFolderWatcher)
+#else
+    QTEST_GUILESS_MAIN(TestFolderWatcher)
+#endif
+
 #include "testfolderwatcher.moc"
diff --git a/test/testinotifywatcher.cpp b/test/testinotifywatcher.cpp
index c1100aa6e..799b09da9 100644
--- a/test/testinotifywatcher.cpp
+++ b/test/testinotifywatcher.cpp
@@ -69,5 +69,5 @@ private slots:
     }
 };
 
-QTEST_MAIN(TestInotifyWatcher)
+QTEST_APPLESS_MAIN(TestInotifyWatcher)
 #include "testinotifywatcher.moc"
diff --git a/test/testnetrcparser.cpp b/test/testnetrcparser.cpp
index ae3222736..1c8724e66 100644
--- a/test/testnetrcparser.cpp
+++ b/test/testnetrcparser.cpp
@@ -72,5 +72,5 @@ private slots:
     }
 };
 
-QTEST_MAIN(TestNetrcParser)
+QTEST_APPLESS_MAIN(TestNetrcParser)
 #include "testnetrcparser.moc"
diff --git a/test/testowncloudpropagator.cpp b/test/testowncloudpropagator.cpp
index 55c0c5b7a..cd8f431a9 100644
--- a/test/testowncloudpropagator.cpp
+++ b/test/testowncloudpropagator.cpp
@@ -78,5 +78,5 @@ private slots:
     }
 };
 
-QTEST_MAIN(TestOwncloudPropagator)
+QTEST_APPLESS_MAIN(TestOwncloudPropagator)
 #include "testowncloudpropagator.moc"
diff --git a/test/testownsql.cpp b/test/testownsql.cpp
index a45f09999..a9265459d 100644
--- a/test/testownsql.cpp
+++ b/test/testownsql.cpp
@@ -149,5 +149,5 @@ private:
     SqlDatabase _db;
 };
 
-QTEST_MAIN(TestOwnSql)
+QTEST_APPLESS_MAIN(TestOwnSql)
 #include "testownsql.moc"
diff --git a/test/testsyncfileitem.cpp b/test/testsyncfileitem.cpp
index e2cc12bc1..8b4732f70 100644
--- a/test/testsyncfileitem.cpp
+++ b/test/testsyncfileitem.cpp
@@ -65,5 +65,5 @@ private slots:
     }
 };
 
-QTEST_MAIN(TestSyncFileItem)
+QTEST_APPLESS_MAIN(TestSyncFileItem)
 #include "testsyncfileitem.moc"
diff --git a/test/testsyncjournaldb.cpp b/test/testsyncjournaldb.cpp
index 9bfce3b54..3550750a6 100644
--- a/test/testsyncjournaldb.cpp
+++ b/test/testsyncjournaldb.cpp
@@ -171,5 +171,5 @@ private:
     SyncJournalDb _db;
 };
 
-QTEST_MAIN(TestSyncJournalDB)
+QTEST_APPLESS_MAIN(TestSyncJournalDB)
 #include "testsyncjournaldb.moc"
diff --git a/test/testupdater.cpp b/test/testupdater.cpp
index deb3821c9..e8b27bf3c 100644
--- a/test/testupdater.cpp
+++ b/test/testupdater.cpp
@@ -30,5 +30,5 @@ private slots:
 
 };
 
-QTEST_MAIN(TestUpdater)
+QTEST_APPLESS_MAIN(TestUpdater)
 #include "testupdater.moc"
diff --git a/test/testutility.cpp b/test/testutility.cpp
index b8f8c1ac9..c00c952b1 100644
--- a/test/testutility.cpp
+++ b/test/testutility.cpp
@@ -160,5 +160,5 @@ private slots:
     }
 };
 
-QTEST_MAIN(TestUtility)
+QTEST_APPLESS_MAIN(TestUtility)
 #include "testutility.moc"
diff --git a/test/testxmlparse.cpp b/test/testxmlparse.cpp
index a5b66aab2..5e49f7ee8 100644
--- a/test/testxmlparse.cpp
+++ b/test/testxmlparse.cpp
@@ -441,5 +441,10 @@ private slots:
 
 };
 
-QTEST_MAIN(TestXmlParse)
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+    QTEST_MAIN(TestXmlParse)
+#else
+    QTEST_GUILESS_MAIN(TestXmlParse)
+#endif
+
 #include "testxmlparse.moc"