diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-01-15 14:04:41 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-01-15 14:04:41 +0100 |
| commit | 851f255b9dfc81c667f02994c0cd3f9cda3f973c (patch) | |
| tree | 0bb41ddef303f0ae8a8635bca360ce4f2489e5fa /src/plugins/updateinfo | |
| parent | 8ab5b7ec0bc10fc35651f3a1046b26d815c24810 (diff) | |
| parent | 8d04b65ae9d5d35e763146d12023c794c743a3fd (diff) | |
Merge remote-tracking branch 'origin/3.0'
Conflicts:
src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp
src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
src/plugins/qmlprofiler/qmlprofilertraceview.cpp
Change-Id: I778a0c2d0f1b4f799caaa2c2cc5daf94ec7ca352
Diffstat (limited to 'src/plugins/updateinfo')
| -rw-r--r-- | src/plugins/updateinfo/updateinfoplugin.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/updateinfo/updateinfoplugin.cpp b/src/plugins/updateinfo/updateinfoplugin.cpp index a586f42393..d52b042d1b 100644 --- a/src/plugins/updateinfo/updateinfoplugin.cpp +++ b/src/plugins/updateinfo/updateinfoplugin.cpp @@ -246,12 +246,13 @@ QDomDocument UpdateInfoPlugin::update() QDomDocument updates; if (updater.exitStatus() != QProcess::CrashExit) { d->m_timer.stop(); - d->m_lastDayChecked = QDate::currentDate(); updates.setContent(updater.readAllStandardOutput()); saveSettings(); // force writing out the last update date } else { qWarning() << "Updater application crashed."; } + + d->m_lastDayChecked = QDate::currentDate(); return updates; } |