diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-25 13:18:31 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-25 13:18:31 +0200 |
| commit | 6896546ba5a6ae59416fe4f527294ba731235218 (patch) | |
| tree | b5b5c8b554f6dcdf391459d996100dbb265e55d1 /src/app | |
| parent | e2ce17ef00218af3db35118b036ebf19834b86e8 (diff) | |
| parent | 1dd9a54ab63d267268b6262b11c7b0189370f174 (diff) | |
| download | qt-creator-6896546ba5a6ae59416fe4f527294ba731235218.tar.gz | |
Merge remote-tracking branch 'origin/2.8'
Conflicts:
src/plugins/cpptools/cppmodelmanager.cpp
Change-Id: I0e69dfad951eb81d8008f5ca05e8fb6999ae2c8a
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/main.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp index acccb28b49..c7317caa2f 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -517,12 +517,6 @@ int main(int argc, char **argv) // shutdown plugin manager on the exit QObject::connect(&app, SIGNAL(aboutToQuit()), &pluginManager, SLOT(shutdown())); -#ifdef WITH_TESTS - // Do this after the event loop has started - if (PluginManager::testRunRequested()) - QTimer::singleShot(100, &pluginManager, SLOT(startTests())); -#endif - const int r = app.exec(); cleanupCrashHandler(); return r; |