From 01bcf0694b0e40e65c6609953b1bb47e98cac994 Mon Sep 17 00:00:00 2001 From: Tim Jenssen <tim.jenssen@nokia.com> Date: Mon, 18 Jan 2010 11:24:48 +0100 Subject: [PATCH] fixed addNewVersionsFromInstaller, if there is no TimeStamp in GlobalSettings - if there is no LastQtVersionUpdate we doesn't have a real timestamp and we are not able to check against this. - this will happen during/after NDK installation Reviewed-by: Daniel Molkentin --- src/plugins/qt4projectmanager/qtversionmanager.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp index bcd9701d668..7e0493a66be 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.cpp +++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp @@ -311,7 +311,8 @@ void QtVersionManager::addNewVersionsFromInstaller() QLatin1String("General/LastQtVersionUpdate")).toDateTime(); const QFileInfo gsFi(globalSettings->fileName()); - if (!gsFi.exists() || (gsFi.lastModified() > lastUpdateFromGlobalSettings)) + if ( !lastUpdateFromGlobalSettings.isNull() && + (!gsFi.exists() || (gsFi.lastModified() > lastUpdateFromGlobalSettings)) ) return; if (!globalSettings->contains(newQtVersionsKey) && -- GitLab