aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/designer
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@qt.io>2019-07-12 15:53:56 +0200
committerTim Jenssen <tim.jenssen@qt.io>2019-07-12 15:53:56 +0200
commit333b33edbe9805e00772c68c7a7f47c8394b786b (patch)
treebcf4f598ce58b3b99ae103e6f2d4ef12c790b84b /src/plugins/designer
parentf7520b7d991c34b3d8e3d1d726dc0b606f32c835 (diff)
parent51cd2885ef56d43b8f421046fab6e5f85f8e6484 (diff)
Merge remote-tracking branch 'origin/4.10'
Diffstat (limited to 'src/plugins/designer')
-rw-r--r--src/plugins/designer/formeditorw.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index d2114c4441..09e89beed0 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -77,6 +77,7 @@
#include <QSettings>
#include <QPluginLoader>
#include <QTime>
+#include <QElapsedTimer>
#include <algorithm>
@@ -351,9 +352,9 @@ void FormEditorData::setupViewActions()
void FormEditorData::fullInit()
{
QTC_ASSERT(m_initStage == FormEditorW::RegisterPlugins, return);
- QTime *initTime = 0;
+ QElapsedTimer *initTime = 0;
if (Designer::Constants::Internal::debug) {
- initTime = new QTime;
+ initTime = new QElapsedTimer;
initTime->start();
}