From 80cea384b94bef4a080720926f61cf7a5a36ad1f Mon Sep 17 00:00:00 2001
From: kh1 <qt-info@nokia.com>
Date: Mon, 11 Oct 2010 14:35:45 +0200
Subject: [PATCH] Fix annoying message box while switching targets with invalid
qt version.
Reviewed-by: ck
---
.../qt4projectmanager/qt-maemo/maemoqemumanager.cpp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp
index d782e508182..71209aa6ea4 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp
@@ -58,6 +58,8 @@
#include <QtXml/QXmlStreamReader>
+#include <limits.h>
+
using namespace ProjectExplorer;
using namespace Qt4ProjectManager;
using namespace Qt4ProjectManager::Internal;
@@ -71,7 +73,7 @@ MaemoQemuManager::MaemoQemuManager(QObject *parent)
: QObject(parent)
, m_qemuAction(0)
, m_qemuProcess(new QProcess(this))
- , m_runningQtId(-1)
+ , m_runningQtId(INT_MIN)
, m_userTerminated(false)
{
m_qemuStarterIcon.addFile(":/qt-maemo/images/qemu-run.png", iconSize);
@@ -412,7 +414,7 @@ void MaemoQemuManager::terminateRuntime()
void MaemoQemuManager::qemuProcessFinished()
{
- m_runningQtId = -1;
+ m_runningQtId = INT_MIN;
QemuStatus status = QemuFinished;
QString error;
@@ -546,7 +548,7 @@ void MaemoQemuManager::toggleStarterButton(Target *target)
}
}
- if (m_runtimes.isEmpty() || !m_runtimes.contains(uniqueId))
+ if (uniqueId >= 0 && (m_runtimes.isEmpty() || !m_runtimes.contains(uniqueId)))
qtVersionsChanged(QList<int>() << uniqueId);
bool isRunning = m_qemuProcess->state() != QProcess::NotRunning;
--
GitLab