forked from qt-creator/qt-creator
Rename PluginManager::runningTests() --> testRunRequested()
Change-Id: I209ebb85ad2a3cc32be0c45ee37ba4918ec42828 Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
@@ -506,7 +506,7 @@ int main(int argc, char **argv)
|
|||||||
|
|
||||||
#ifdef WITH_TESTS
|
#ifdef WITH_TESTS
|
||||||
// Do this after the event loop has started
|
// Do this after the event loop has started
|
||||||
if (PluginManager::runningTests())
|
if (PluginManager::testRunRequested())
|
||||||
QTimer::singleShot(100, &pluginManager, SLOT(startTests()));
|
QTimer::singleShot(100, &pluginManager, SLOT(startTests()));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@@ -750,7 +750,7 @@ void PluginManager::startTests()
|
|||||||
* \fn bool PluginManager::runningTests() const
|
* \fn bool PluginManager::runningTests() const
|
||||||
* \internal
|
* \internal
|
||||||
*/
|
*/
|
||||||
bool PluginManager::runningTests()
|
bool PluginManager::testRunRequested()
|
||||||
{
|
{
|
||||||
return !m_instance->d->testSpecs.isEmpty();
|
return !m_instance->d->testSpecs.isEmpty();
|
||||||
}
|
}
|
||||||
|
@@ -124,7 +124,7 @@ public:
|
|||||||
|
|
||||||
static QString serializedArguments();
|
static QString serializedArguments();
|
||||||
|
|
||||||
static bool runningTests();
|
static bool testRunRequested();
|
||||||
static QString testDataDirectory();
|
static QString testDataDirectory();
|
||||||
|
|
||||||
static void profilingReport(const char *what, const PluginSpec *spec = 0);
|
static void profilingReport(const char *what, const PluginSpec *spec = 0);
|
||||||
|
@@ -1116,7 +1116,7 @@ bool FakeVimPluginPrivate::initialize()
|
|||||||
this, SLOT(handleDelayedQuitAll(bool)), Qt::QueuedConnection);
|
this, SLOT(handleDelayedQuitAll(bool)), Qt::QueuedConnection);
|
||||||
|
|
||||||
// Vimrc can break test so don't source it if running tests.
|
// Vimrc can break test so don't source it if running tests.
|
||||||
if (!ExtensionSystem::PluginManager::runningTests())
|
if (!ExtensionSystem::PluginManager::testRunRequested())
|
||||||
maybeReadVimRc();
|
maybeReadVimRc();
|
||||||
// << "MODE: " << theFakeVimSetting(ConfigUseFakeVim)->value();
|
// << "MODE: " << theFakeVimSetting(ConfigUseFakeVim)->value();
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user