Use QTEST_GUILESS_MAIN where applicable

instead of QTEST_MAIN. Reduces the initialization that is done by the Qt
test applications, and can also reduce interference with normal OS
operations like the current window loosing focus.

Change-Id: If88f289281aa1c8703ac7d4dbe0799d067c16588
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

47 files changed, 47 insertions, 50 deletions

diff --git a/tests/auto/aggregation/tst_aggregate.cpp b/tests/auto/aggregation/tst_aggregate.cpp
index cb7d06dcb7..082da763f7 100644
--- a/tests/auto/aggregation/tst_aggregate.cpp
+++ b/tests/auto/aggregation/tst_aggregate.cpp
@@ -199,6 +199,6 @@ void tst_Aggregate::parentAggregate()
     QCOMPARE(Aggregation::Aggregate::parentAggregate(component11), (Aggregation::Aggregate *)0);
 }
 
-QTEST_MAIN(tst_Aggregate)
+QTEST_GUILESS_MAIN(tst_Aggregate)
 
 #include "tst_aggregate.moc"
diff --git a/tests/auto/algorithm/tst_algorithm.cpp b/tests/auto/algorithm/tst_algorithm.cpp
index 3cc0301e81..56fcd84f75 100644
--- a/tests/auto/algorithm/tst_algorithm.cpp
+++ b/tests/auto/algorithm/tst_algorithm.cpp
@@ -577,6 +577,6 @@ void tst_Algorithm::take()
     }
 }
 
-QTEST_MAIN(tst_Algorithm)
+QTEST_GUILESS_MAIN(tst_Algorithm)
 
 #include "tst_algorithm.moc"
diff --git a/tests/auto/android/tst_avdmanageroutputparser.cpp b/tests/auto/android/tst_avdmanageroutputparser.cpp
index 61157f75eb..4dc8a0d357 100644
--- a/tests/auto/android/tst_avdmanageroutputparser.cpp
+++ b/tests/auto/android/tst_avdmanageroutputparser.cpp
@@ -108,6 +108,6 @@ void tst_AvdManagerOutputParser::parse()
     QCOMPARE(avdErrorPaths, errorPaths);
 }
 
-QTEST_MAIN(tst_AvdManagerOutputParser)
+QTEST_GUILESS_MAIN(tst_AvdManagerOutputParser)
 
 #include "tst_avdmanageroutputparser.moc"
diff --git a/tests/auto/changeset/tst_changeset.cpp b/tests/auto/changeset/tst_changeset.cpp
index 5d5b6ed35a..7c1ca1209f 100644
--- a/tests/auto/changeset/tst_changeset.cpp
+++ b/tests/auto/changeset/tst_changeset.cpp
@@ -435,6 +435,6 @@ void tst_ChangeSet::conflicts()
     }
 }
 
-QTEST_MAIN(tst_ChangeSet)
+QTEST_GUILESS_MAIN(tst_ChangeSet)
 
 #include "tst_changeset.moc"
diff --git a/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp b/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
index d98dc3e21e..d14c6eba39 100644
--- a/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
+++ b/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
@@ -2221,7 +2221,7 @@ void tst_CodeFormatter::structuredBinding()
     checkIndent(data);
 }
 
-QTEST_MAIN(tst_CodeFormatter)
+QTEST_GUILESS_MAIN(tst_CodeFormatter)
 
 #include "tst_codeformatter.moc"
 
diff --git a/tests/auto/cplusplus/cppselectionchanger/tst_cppselectionchangertest.cpp b/tests/auto/cplusplus/cppselectionchanger/tst_cppselectionchangertest.cpp
index f8808fbaeb..0f45c14322 100644
--- a/tests/auto/cplusplus/cppselectionchanger/tst_cppselectionchangertest.cpp
+++ b/tests/auto/cplusplus/cppselectionchanger/tst_cppselectionchangertest.cpp
@@ -1154,5 +1154,5 @@ void tst_CppSelectionChanger::testWholeDocumentSelection()
     QVERIFY(!result);
 }
 
-QTEST_MAIN(tst_CppSelectionChanger)
+QTEST_GUILESS_MAIN(tst_CppSelectionChanger)
 #include "tst_cppselectionchangertest.moc"
diff --git a/tests/auto/cplusplus/fileiterationorder/tst_fileiterationorder.cpp b/tests/auto/cplusplus/fileiterationorder/tst_fileiterationorder.cpp
index 46f7a83da8..663b8f86d9 100644
--- a/tests/auto/cplusplus/fileiterationorder/tst_fileiterationorder.cpp
+++ b/tests/auto/cplusplus/fileiterationorder/tst_fileiterationorder.cpp
@@ -98,5 +98,5 @@ void tst_FileIterationOrder::preferWithCommonPrefixToReferenceFilePath()
     QCOMPARE(order.toStringList(), expected);
 }
 
-QTEST_MAIN(tst_FileIterationOrder)
+QTEST_GUILESS_MAIN(tst_FileIterationOrder)
 #include "tst_fileiterationorder.moc"
diff --git a/tests/auto/cplusplus/misc/tst_misc.cpp b/tests/auto/cplusplus/misc/tst_misc.cpp
index 694594d7d2..b88e75569b 100644
--- a/tests/auto/cplusplus/misc/tst_misc.cpp
+++ b/tests/auto/cplusplus/misc/tst_misc.cpp
@@ -279,5 +279,5 @@ void tst_Misc::doNotCrashForInvalidRawString()
     doc->check();
 }
 
-QTEST_MAIN(tst_Misc)
+QTEST_GUILESS_MAIN(tst_Misc)
 #include "tst_misc.moc"
diff --git a/tests/auto/cplusplus/semantic/tst_semantic.cpp b/tests/auto/cplusplus/semantic/tst_semantic.cpp
index deda2aab2c..473dd7eccf 100644
--- a/tests/auto/cplusplus/semantic/tst_semantic.cpp
+++ b/tests/auto/cplusplus/semantic/tst_semantic.cpp
@@ -1041,5 +1041,5 @@ void tst_Semantic::enum_constantValueNegative()
     testEnumaratorDeclarator(e, 3, "1");
 }
 
-QTEST_MAIN(tst_Semantic)
+QTEST_GUILESS_MAIN(tst_Semantic)
 #include "tst_semantic.moc"
diff --git a/tests/auto/diff/differ/tst_differ.cpp b/tests/auto/diff/differ/tst_differ.cpp
index 821bcc3dcf..42f41348c8 100644
--- a/tests/auto/diff/differ/tst_differ.cpp
+++ b/tests/auto/diff/differ/tst_differ.cpp
@@ -795,8 +795,7 @@ void tst_Differ::cleanupSemanticsLossless()
     QCOMPARE(result, expected);
 }
 
-
-QTEST_MAIN(tst_Differ)
+QTEST_GUILESS_MAIN(tst_Differ)
 
 #include "tst_differ.moc"
 
diff --git a/tests/auto/environment/tst_environment.cpp b/tests/auto/environment/tst_environment.cpp
index 71614400d6..1ee17dec81 100644
--- a/tests/auto/environment/tst_environment.cpp
+++ b/tests/auto/environment/tst_environment.cpp
@@ -349,6 +349,6 @@ void tst_Environment::find()
 
 }
 
-QTEST_MAIN(tst_Environment)
+QTEST_GUILESS_MAIN(tst_Environment)
 
 #include "tst_environment.moc"
diff --git a/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp b/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp
index 4b55043f96..523330deb6 100644
--- a/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp
+++ b/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp
@@ -212,7 +212,7 @@ void tst_PluginManager::correctPlugins1()
     QVERIFY(plugin3running);
 }
 
-QTEST_MAIN(tst_PluginManager)
+QTEST_GUILESS_MAIN(tst_PluginManager)
 
 #include "tst_pluginmanager.moc"
 
diff --git a/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp b/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp
index a0ada8154a..7a2d2ef05b 100644
--- a/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp
+++ b/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp
@@ -338,6 +338,6 @@ void tst_PluginSpec::initializeExtensions()
     QVERIFY(isExtensionsInitialized);
 }
 
-QTEST_MAIN(tst_PluginSpec)
+QTEST_GUILESS_MAIN(tst_PluginSpec)
 
 #include "tst_pluginspec.moc"
diff --git a/tests/auto/filesearch/tst_filesearch.cpp b/tests/auto/filesearch/tst_filesearch.cpp
index 373981274e..0139ff90b6 100644
--- a/tests/auto/filesearch/tst_filesearch.cpp
+++ b/tests/auto/filesearch/tst_filesearch.cpp
@@ -146,6 +146,6 @@ void tst_FileSearch::matchCaseReplacement()
     QCOMPARE(Utils::matchCaseReplacement("pReFiXTeStPaDSuFfIx", "prefixfoobarsuffix"), QString("pReFiXfoobarSuFfIx"));   //mixed case, use replacement as specified
 }
 
-QTEST_MAIN(tst_FileSearch)
+QTEST_GUILESS_MAIN(tst_FileSearch)
 
 #include "tst_filesearch.moc"
diff --git a/tests/auto/json/tst_json.cpp b/tests/auto/json/tst_json.cpp
index f583a1ba3e..5733a1eef4 100644
--- a/tests/auto/json/tst_json.cpp
+++ b/tests/auto/json/tst_json.cpp
@@ -2527,6 +2527,6 @@ void tst_Json::removeNonLatinKey()
     QVERIFY(restoredObject.contains(nonLatinKeyName));
 }
 
-QTEST_MAIN(tst_Json)
+QTEST_GUILESS_MAIN(tst_Json)
 
 #include "tst_json.moc"
diff --git a/tests/auto/languageserverprotocol/tst_languageserverprotocol.cpp b/tests/auto/languageserverprotocol/tst_languageserverprotocol.cpp
index 86d817c5f0..d2b2cc72bf 100644
--- a/tests/auto/languageserverprotocol/tst_languageserverprotocol.cpp
+++ b/tests/auto/languageserverprotocol/tst_languageserverprotocol.cpp
@@ -596,6 +596,6 @@ void tst_LanguageServerProtocol::range()
     QCOMPARE(r2.contains(r1), r2Containsr1);
 }
 
-QTEST_MAIN(tst_LanguageServerProtocol)
+QTEST_GUILESS_MAIN(tst_LanguageServerProtocol)
 
 #include "tst_languageserverprotocol.moc"
diff --git a/tests/auto/mapreduce/tst_mapreduce.cpp b/tests/auto/mapreduce/tst_mapreduce.cpp
index 60f1ebc002..cc3620c8cf 100644
--- a/tests/auto/mapreduce/tst_mapreduce.cpp
+++ b/tests/auto/mapreduce/tst_mapreduce.cpp
@@ -363,6 +363,6 @@ void tst_MapReduce::moveOnlyType()
 
 #endif
 
-QTEST_MAIN(tst_MapReduce)
+QTEST_GUILESS_MAIN(tst_MapReduce)
 
 #include "tst_mapreduce.moc"
diff --git a/tests/auto/pointeralgorithm/tst_pointeralgorithm.cpp b/tests/auto/pointeralgorithm/tst_pointeralgorithm.cpp
index d160768c5f..142b8ef4db 100644
--- a/tests/auto/pointeralgorithm/tst_pointeralgorithm.cpp
+++ b/tests/auto/pointeralgorithm/tst_pointeralgorithm.cpp
@@ -319,6 +319,6 @@ void tst_PointerAlgorithm::takeOrDefault()
     }
 }
 
-QTEST_MAIN(tst_PointerAlgorithm)
+QTEST_GUILESS_MAIN(tst_PointerAlgorithm)
 
 #include "tst_pointeralgorithm.moc"
diff --git a/tests/auto/profilewriter/tst_profilewriter.cpp b/tests/auto/profilewriter/tst_profilewriter.cpp
index 62b375aaa7..3be0fedaf1 100644
--- a/tests/auto/profilewriter/tst_profilewriter.cpp
+++ b/tests/auto/profilewriter/tst_profilewriter.cpp
@@ -744,6 +744,5 @@ void tst_ProFileWriter::removeFiles()
     QCOMPARE(lines.join(QLatin1Char('\n')), output);
 }
 
-
-QTEST_MAIN(tst_ProFileWriter)
+QTEST_GUILESS_MAIN(tst_ProFileWriter)
 #include "tst_profilewriter.moc"
diff --git a/tests/auto/qml/codemodel/check/tst_check.cpp b/tests/auto/qml/codemodel/check/tst_check.cpp
index 45d3d11880..07bb0146c8 100644
--- a/tests/auto/qml/codemodel/check/tst_check.cpp
+++ b/tests/auto/qml/codemodel/check/tst_check.cpp
@@ -225,6 +225,6 @@ void tst_Check::test()
     }
 }
 
-QTEST_MAIN(tst_Check);
+QTEST_GUILESS_MAIN(tst_Check);
 
 #include "tst_check.moc"
diff --git a/tests/auto/qml/codemodel/dependencies/tst_dependencies.cpp b/tests/auto/qml/codemodel/dependencies/tst_dependencies.cpp
index e2c5edc6bf..26900bb68b 100644
--- a/tests/auto/qml/codemodel/dependencies/tst_dependencies.cpp
+++ b/tests/auto/qml/codemodel/dependencies/tst_dependencies.cpp
@@ -181,6 +181,6 @@ void tst_Dependencies::test()
     QCOMPARE(semanticInfo.staticAnalysisMessages.length(), nExpectedStaticMessages);
 }
 
-QTEST_MAIN(tst_Dependencies)
+QTEST_GUILESS_MAIN(tst_Dependencies)
 
 #include "tst_dependencies.moc"
diff --git a/tests/auto/qml/codemodel/ecmascript7/tst_ecmascript7.cpp b/tests/auto/qml/codemodel/ecmascript7/tst_ecmascript7.cpp
index ea530d2143..153a3fa8a0 100644
--- a/tests/auto/qml/codemodel/ecmascript7/tst_ecmascript7.cpp
+++ b/tests/auto/qml/codemodel/ecmascript7/tst_ecmascript7.cpp
@@ -207,6 +207,6 @@ void tst_Ecmascript::test()
     QCOMPARE(semanticInfo.staticAnalysisMessages.length(), nExpectedStaticMessages);
 }
 
-QTEST_MAIN(tst_Ecmascript)
+QTEST_GUILESS_MAIN(tst_Ecmascript)
 
 #include "tst_ecmascript7.moc"
diff --git a/tests/auto/qml/codemodel/importscheck/tst_importscheck.cpp b/tests/auto/qml/codemodel/importscheck/tst_importscheck.cpp
index 04660c7a9c..d5cdce6503 100644
--- a/tests/auto/qml/codemodel/importscheck/tst_importscheck.cpp
+++ b/tests/auto/qml/codemodel/importscheck/tst_importscheck.cpp
@@ -414,7 +414,7 @@ int main(int argc, char *argv[])
 
 #else
 
-QTEST_MAIN(tst_ImportCheck)
+QTEST_GUILESS_MAIN(tst_ImportCheck)
 
 #endif // MANUAL_IMPORT_SCANNER
 
diff --git a/tests/auto/qml/persistenttrie/tst_testtrie.cpp b/tests/auto/qml/persistenttrie/tst_testtrie.cpp
index 0b78c28d34..6d607aa499 100644
--- a/tests/auto/qml/persistenttrie/tst_testtrie.cpp
+++ b/tests/auto/qml/persistenttrie/tst_testtrie.cpp
@@ -363,7 +363,7 @@ int main(int , const char *[])
 
 #else
 
-QTEST_MAIN(tst_TestTrie);
+QTEST_GUILESS_MAIN(tst_TestTrie);
 
 //#include "moc_tst_testtrie.cpp"
 
diff --git a/tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp b/tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp
index 0c12c15cf2..7b9d733714 100644
--- a/tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp
+++ b/tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp
@@ -1586,7 +1586,7 @@ void tst_QMLCodeFormatter::bug3()
     checkIndent(data);
 }
 
-QTEST_MAIN(tst_QMLCodeFormatter)
+QTEST_GUILESS_MAIN(tst_QMLCodeFormatter)
 #include "tst_qmlcodeformatter.moc"
 
 
diff --git a/tests/auto/qml/qmljssimplereader/tst_qmljssimplereader.cpp b/tests/auto/qml/qmljssimplereader/tst_qmljssimplereader.cpp
index 128bc14c6b..fd116600d0 100644
--- a/tests/auto/qml/qmljssimplereader/tst_qmljssimplereader.cpp
+++ b/tests/auto/qml/qmljssimplereader/tst_qmljssimplereader.cpp
@@ -248,6 +248,6 @@ void tst_SimpleReader::testBug01()
     QCOMPARE(rootNode->propertyNames().count(), 1);
 }
 
-QTEST_MAIN(tst_SimpleReader);
+QTEST_GUILESS_MAIN(tst_SimpleReader);
 
 #include "tst_qmljssimplereader.moc"
diff --git a/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp b/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp
index 571fc96c4f..551fc1a2d5 100644
--- a/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp
+++ b/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp
@@ -253,5 +253,5 @@ void tst_FileFormat::testMainFile()
     delete project;
 }
 
-QTEST_MAIN(tst_FileFormat);
+QTEST_GUILESS_MAIN(tst_FileFormat);
 #include "tst_fileformat.moc"
diff --git a/tests/auto/qml/reformatter/tst_reformatter.cpp b/tests/auto/qml/reformatter/tst_reformatter.cpp
index 64506195c4..f6fbe1d6b4 100644
--- a/tests/auto/qml/reformatter/tst_reformatter.cpp
+++ b/tests/auto/qml/reformatter/tst_reformatter.cpp
@@ -116,6 +116,6 @@ void tst_Reformatter::test()
     QCOMPARE(sourceLines.size(), newLines.size());
 }
 
-QTEST_MAIN(tst_Reformatter);
+QTEST_GUILESS_MAIN(tst_Reformatter);
 
 #include "tst_reformatter.moc"
diff --git a/tests/auto/runextensions/tst_runextensions.cpp b/tests/auto/runextensions/tst_runextensions.cpp
index fd0c6609d8..4e06d3e295 100644
--- a/tests/auto/runextensions/tst_runextensions.cpp
+++ b/tests/auto/runextensions/tst_runextensions.cpp
@@ -631,6 +631,6 @@ void tst_RunExtensions::onResultReady()
     }
 }
 
-QTEST_MAIN(tst_RunExtensions)
+QTEST_GUILESS_MAIN(tst_RunExtensions)
 
 #include "tst_runextensions.moc"
diff --git a/tests/auto/sdktool/tst_sdktool.cpp b/tests/auto/sdktool/tst_sdktool.cpp
index 1cacda5fe0..939870aa91 100644
--- a/tests/auto/sdktool/tst_sdktool.cpp
+++ b/tests/auto/sdktool/tst_sdktool.cpp
@@ -78,6 +78,6 @@ private slots:
     void test_RmToolChainOperation() { RmToolChainOperation::unittest(); }
 };
 
-QTEST_MAIN(SdktoolTest)
+QTEST_GUILESS_MAIN(SdktoolTest)
 
 #include "tst_sdktool.moc"
diff --git a/tests/auto/toolchaincache/tst_toolchaincache.cpp b/tests/auto/toolchaincache/tst_toolchaincache.cpp
index 3e4da445ac..8fbcb43a23 100644
--- a/tests/auto/toolchaincache/tst_toolchaincache.cpp
+++ b/tests/auto/toolchaincache/tst_toolchaincache.cpp
@@ -132,5 +132,5 @@ void tst_ToolChainCache::insertOneTwoOneThree()
     QVERIFY(!cache.check({"other"}));
 }
 
-QTEST_MAIN(tst_ToolChainCache)
+QTEST_GUILESS_MAIN(tst_ToolChainCache)
 #include "tst_toolchaincache.moc"
diff --git a/tests/auto/tracing/timelineabstractrenderer/tst_timelineabstractrenderer.cpp b/tests/auto/tracing/timelineabstractrenderer/tst_timelineabstractrenderer.cpp
index e4f8e7b69d..d48dd1a118 100644
--- a/tests/auto/tracing/timelineabstractrenderer/tst_timelineabstractrenderer.cpp
+++ b/tests/auto/tracing/timelineabstractrenderer/tst_timelineabstractrenderer.cpp
@@ -152,6 +152,6 @@ void tst_TimelineAbstractRenderer::dirty()
     QVERIFY(!renderer.rowHeightsDirty());
 }
 
-QTEST_MAIN(tst_TimelineAbstractRenderer)
+QTEST_GUILESS_MAIN(tst_TimelineAbstractRenderer)
 
 #include "tst_timelineabstractrenderer.moc"
diff --git a/tests/auto/tracing/timelinemodel/tst_timelinemodel.cpp b/tests/auto/tracing/timelinemodel/tst_timelinemodel.cpp
index 812f51d226..4d5e4dd9ee 100644
--- a/tests/auto/tracing/timelinemodel/tst_timelinemodel.cpp
+++ b/tests/auto/tracing/timelinemodel/tst_timelinemodel.cpp
@@ -483,6 +483,6 @@ void tst_TimelineModel::parentingOfEqualStarts()
     QCOMPARE(dummy.lastIndex(2), 1);
 }
 
-QTEST_MAIN(tst_TimelineModel)
+QTEST_GUILESS_MAIN(tst_TimelineModel)
 
 #include "tst_timelinemodel.moc"
diff --git a/tests/auto/tracing/timelinemodelaggregator/tst_timelinemodelaggregator.cpp b/tests/auto/tracing/timelinemodelaggregator/tst_timelinemodelaggregator.cpp
index 7a964edb5f..a1454c0475 100644
--- a/tests/auto/tracing/timelinemodelaggregator/tst_timelinemodelaggregator.cpp
+++ b/tests/auto/tracing/timelinemodelaggregator/tst_timelinemodelaggregator.cpp
@@ -162,6 +162,6 @@ void tst_TimelineModelAggregator::prevNext()
     }
 }
 
-QTEST_MAIN(tst_TimelineModelAggregator)
+QTEST_GUILESS_MAIN(tst_TimelineModelAggregator)
 
 #include "tst_timelinemodelaggregator.moc"
diff --git a/tests/auto/tracing/timelinenotesmodel/tst_timelinenotesmodel.cpp b/tests/auto/tracing/timelinenotesmodel/tst_timelinenotesmodel.cpp
index dd861cb5a9..26171c387f 100644
--- a/tests/auto/tracing/timelinenotesmodel/tst_timelinenotesmodel.cpp
+++ b/tests/auto/tracing/timelinenotesmodel/tst_timelinenotesmodel.cpp
@@ -193,6 +193,6 @@ void tst_TimelineNotesModel::modify()
 
 }
 
-QTEST_MAIN(tst_TimelineNotesModel)
+QTEST_GUILESS_MAIN(tst_TimelineNotesModel)
 
 #include "tst_timelinenotesmodel.moc"
diff --git a/tests/auto/tracing/timelineoverviewrenderer/tst_timelineoverviewrenderer.cpp b/tests/auto/tracing/timelineoverviewrenderer/tst_timelineoverviewrenderer.cpp
index 0dfed3eec8..8ca225f15d 100644
--- a/tests/auto/tracing/timelineoverviewrenderer/tst_timelineoverviewrenderer.cpp
+++ b/tests/auto/tracing/timelineoverviewrenderer/tst_timelineoverviewrenderer.cpp
@@ -75,6 +75,6 @@ void tst_TimelineOverviewRenderer::updatePaintNode()
     delete node;
 }
 
-QTEST_MAIN(tst_TimelineOverviewRenderer)
+QTEST_GUILESS_MAIN(tst_TimelineOverviewRenderer)
 
 #include "tst_timelineoverviewrenderer.moc"
diff --git a/tests/auto/tracing/timelinerenderpass/tst_timelinerenderpass.cpp b/tests/auto/tracing/timelinerenderpass/tst_timelinerenderpass.cpp
index d59fad4284..6890e521ee 100644
--- a/tests/auto/tracing/timelinerenderpass/tst_timelinerenderpass.cpp
+++ b/tests/auto/tracing/timelinerenderpass/tst_timelinerenderpass.cpp
@@ -86,7 +86,7 @@ void tst_TimelineRenderPass::emptyState()
     QVERIFY(state.expandedRows().isEmpty());
 }
 
-QTEST_MAIN(tst_TimelineRenderPass)
+QTEST_GUILESS_MAIN(tst_TimelineRenderPass)
 
 #include "tst_timelinerenderpass.moc"
 
diff --git a/tests/auto/tracing/timelinerenderstate/tst_timelinerenderstate.cpp b/tests/auto/tracing/timelinerenderstate/tst_timelinerenderstate.cpp
index 08329bb69a..4fdbb025f5 100644
--- a/tests/auto/tracing/timelinerenderstate/tst_timelinerenderstate.cpp
+++ b/tests/auto/tracing/timelinerenderstate/tst_timelinerenderstate.cpp
@@ -171,7 +171,7 @@ void tst_TimelineRenderState::assembleNodeTree()
     delete node;
 }
 
-QTEST_MAIN(tst_TimelineRenderState)
+QTEST_GUILESS_MAIN(tst_TimelineRenderState)
 
 #include "tst_timelinerenderstate.moc"
 
diff --git a/tests/auto/tracing/timelinezoomcontrol/tst_timelinezoomcontrol.cpp b/tests/auto/tracing/timelinezoomcontrol/tst_timelinezoomcontrol.cpp
index e57763cf66..770b1b67c2 100644
--- a/tests/auto/tracing/timelinezoomcontrol/tst_timelinezoomcontrol.cpp
+++ b/tests/auto/tracing/timelinezoomcontrol/tst_timelinezoomcontrol.cpp
@@ -217,6 +217,6 @@ void tst_TimelineZoomControl::selection()
     QCOMPARE(spy.count(), 2);
 }
 
-QTEST_MAIN(tst_TimelineZoomControl)
+QTEST_GUILESS_MAIN(tst_TimelineZoomControl)
 
 #include "tst_timelinezoomcontrol.moc"
diff --git a/tests/auto/utils/fileutils/tst_fileutils.cpp b/tests/auto/utils/fileutils/tst_fileutils.cpp
index 45e1c7df85..38856873b9 100644
--- a/tests/auto/utils/fileutils/tst_fileutils.cpp
+++ b/tests/auto/utils/fileutils/tst_fileutils.cpp
@@ -527,5 +527,5 @@ void tst_fileutils::asyncLocalCopy()
     QVERIFY(spy.count() == 1 || spy.wait(3000));
 }
 
-QTEST_MAIN(tst_fileutils)
+QTEST_GUILESS_MAIN(tst_fileutils)
 #include "tst_fileutils.moc"
diff --git a/tests/auto/utils/indexedcontainerproxyconstiterator/tst_indexedcontainerproxyconstiterator.cpp b/tests/auto/utils/indexedcontainerproxyconstiterator/tst_indexedcontainerproxyconstiterator.cpp
index b60b5cf114..e42068e626 100644
--- a/tests/auto/utils/indexedcontainerproxyconstiterator/tst_indexedcontainerproxyconstiterator.cpp
+++ b/tests/auto/utils/indexedcontainerproxyconstiterator/tst_indexedcontainerproxyconstiterator.cpp
@@ -204,6 +204,6 @@ void tst_IndexedContainerProxyConstIterator::testIteration()
     QCOMPARE(boolsCopy, bools);
 }
 
-QTEST_MAIN(tst_IndexedContainerProxyConstIterator)
+QTEST_GUILESS_MAIN(tst_IndexedContainerProxyConstIterator)
 
 #include "tst_indexedcontainerproxyconstiterator.moc"
diff --git a/tests/auto/utils/persistentsettings/tst_persistentsettings.cpp b/tests/auto/utils/persistentsettings/tst_persistentsettings.cpp
index bd965523f2..3885b5073d 100644
--- a/tests/auto/utils/persistentsettings/tst_persistentsettings.cpp
+++ b/tests/auto/utils/persistentsettings/tst_persistentsettings.cpp
@@ -101,6 +101,6 @@ void PersistentSettingsTest::tst_readwrite()
     tmpDir.setAutoRemove(!QTest::currentTestFailed());
 }
 
-QTEST_MAIN(PersistentSettingsTest)
+QTEST_GUILESS_MAIN(PersistentSettingsTest)
 
 #include "tst_persistentsettings.moc"
diff --git a/tests/auto/utils/qtcprocess/tst_qtcprocess.cpp b/tests/auto/utils/qtcprocess/tst_qtcprocess.cpp
index 7d59619bd5..461da201e5 100644
--- a/tests/auto/utils/qtcprocess/tst_qtcprocess.cpp
+++ b/tests/auto/utils/qtcprocess/tst_qtcprocess.cpp
@@ -1352,6 +1352,6 @@ void tst_QtcProcess::quitBlockingProcess()
     }
 }
 
-QTEST_MAIN(tst_QtcProcess)
+QTEST_GUILESS_MAIN(tst_QtcProcess)
 
 #include "tst_qtcprocess.moc"
diff --git a/tests/auto/utils/settings/tst_settings.cpp b/tests/auto/utils/settings/tst_settings.cpp
index 28385d9ced..8e7d2df044 100644
--- a/tests/auto/utils/settings/tst_settings.cpp
+++ b/tests/auto/utils/settings/tst_settings.cpp
@@ -752,6 +752,6 @@ void tst_SettingsAccessor::loadSettings_pickBest()
     QCOMPARE(read.size(), data.size() + 2);
 }
 
-QTEST_MAIN(tst_SettingsAccessor)
+QTEST_GUILESS_MAIN(tst_SettingsAccessor)
 
 #include "tst_settings.moc"
diff --git a/tests/auto/utils/stringutils/tst_stringutils.cpp b/tests/auto/utils/stringutils/tst_stringutils.cpp
index 010e6ce8b4..14b9e1d479 100644
--- a/tests/auto/utils/stringutils/tst_stringutils.cpp
+++ b/tests/auto/utils/stringutils/tst_stringutils.cpp
@@ -267,6 +267,6 @@ void tst_StringUtils::testParseUsedPortFromNetstatOutput_data()
     QTest::newRow("QnxA") << "tcp6       0      0  *.22                   *.*                    LISTEN   "     <<    22;
 }
 
-QTEST_MAIN(tst_StringUtils)
+QTEST_GUILESS_MAIN(tst_StringUtils)
 
 #include "tst_stringutils.moc"
diff --git a/tests/auto/utils/templateengine/tst_templateengine.cpp b/tests/auto/utils/templateengine/tst_templateengine.cpp
index a9352b1783..388cefb95f 100644
--- a/tests/auto/utils/templateengine/tst_templateengine.cpp
+++ b/tests/auto/utils/templateengine/tst_templateengine.cpp
@@ -99,7 +99,6 @@ void tst_TemplateEngine::testTemplateEngine()
     QCOMPARE(errorMessage, expectedErrorMessage);
 }
 
-
-QTEST_MAIN(tst_TemplateEngine)
+QTEST_GUILESS_MAIN(tst_TemplateEngine)
 
 #include "tst_templateengine.moc"
diff --git a/tests/auto/utils/treemodel/tst_treemodel.cpp b/tests/auto/utils/treemodel/tst_treemodel.cpp
index 22eb5a23f2..fbf181820e 100644
--- a/tests/auto/utils/treemodel/tst_treemodel.cpp
+++ b/tests/auto/utils/treemodel/tst_treemodel.cpp
@@ -130,6 +130,6 @@ void tst_TreeModel::testTypes()
     static_assert(std::is_same<Internal::SelectType<3, A, B, C>::Type, TreeItem>::value, "");
 }
 
-QTEST_MAIN(tst_TreeModel)
+QTEST_GUILESS_MAIN(tst_TreeModel)
 
 #include "tst_treemodel.moc"