diff --git a/src/app/main.cpp b/src/app/main.cpp index 1db6fc2bdaf8ffe4cc397660d6af70be97fdba2a..c7fe2c623cc61f926ca18374c0e0875a35f06aa4 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -506,7 +506,7 @@ int main(int argc, char **argv) #ifdef WITH_TESTS // Do this after the event loop has started - if (PluginManager::runningTests()) + if (PluginManager::testRunRequested()) QTimer::singleShot(100, &pluginManager, SLOT(startTests())); #endif diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp index d5c7b87e7f6f3e03a8d34a2692c66342ca297e34..69b513179335b8989618a68c68d45b6b5f559c86 100644 --- a/src/libs/extensionsystem/pluginmanager.cpp +++ b/src/libs/extensionsystem/pluginmanager.cpp @@ -750,7 +750,7 @@ void PluginManager::startTests() * \fn bool PluginManager::runningTests() const * \internal */ -bool PluginManager::runningTests() +bool PluginManager::testRunRequested() { return !m_instance->d->testSpecs.isEmpty(); } diff --git a/src/libs/extensionsystem/pluginmanager.h b/src/libs/extensionsystem/pluginmanager.h index e20159abfca8fbb510cef2f661f1a1a82a124dfb..428559eaf2a63cf1fd9057c01128a7470e839c91 100644 --- a/src/libs/extensionsystem/pluginmanager.h +++ b/src/libs/extensionsystem/pluginmanager.h @@ -124,7 +124,7 @@ public: static QString serializedArguments(); - static bool runningTests(); + static bool testRunRequested(); static QString testDataDirectory(); static void profilingReport(const char *what, const PluginSpec *spec = 0); diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index a982c8121a777a3efb0c7f3acef3125cc3fe530c..a8e8ff13862f17f6db2963a0f6fa5ab56e9c55a3 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -1116,7 +1116,7 @@ bool FakeVimPluginPrivate::initialize() this, SLOT(handleDelayedQuitAll(bool)), Qt::QueuedConnection); // Vimrc can break test so don't source it if running tests. - if (!ExtensionSystem::PluginManager::runningTests()) + if (!ExtensionSystem::PluginManager::testRunRequested()) maybeReadVimRc(); // << "MODE: " << theFakeVimSetting(ConfigUseFakeVim)->value();