diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-08-12 17:04:12 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-08-12 17:04:12 +0200 |
| commit | 21c2bf7e72b6c48ac2ce013001f5bbdc118b1375 (patch) | |
| tree | 01c9a4ffb658c2cf3fac721508ddc809cfb8aae6 /src/plugins/studiowelcome | |
| parent | a90b1c26b1d9f7b76dad51e5ec5f2c15f8816ad6 (diff) | |
| parent | 821f799ff3d017e9cdc8bfe3c96fed1982de8753 (diff) | |
Merge remote-tracking branch 'origin/4.10'
Conflicts:
src/plugins/python/CMakeLists.txt
Change-Id: I18808710dd99b97d4e1e7c3d223b7f814083de31
Diffstat (limited to 'src/plugins/studiowelcome')
| -rw-r--r-- | src/plugins/studiowelcome/studiowelcomeplugin.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/plugins/studiowelcome/studiowelcomeplugin.cpp b/src/plugins/studiowelcome/studiowelcomeplugin.cpp index b5dc746898..82bb082c0a 100644 --- a/src/plugins/studiowelcome/studiowelcomeplugin.cpp +++ b/src/plugins/studiowelcome/studiowelcomeplugin.cpp @@ -249,10 +249,7 @@ void StudioWelcomePlugin::extensionsInitialized() s_view->show(); s_view->raise(); - QTimer::singleShot(15000, [](){ - if (s_view) - s_view->close(); - }); + QTimer::singleShot(15000, [this](){ closeSplashScreen(); }); }); } } |