feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix annoying message box while switching targets with invalid qt version.

Browse Source 
Reviewed-by: ck
This commit is contained in:
kh1
2010-10-11 14:35:45 +02:00
parent 81787fbd86
commit 80cea384b9
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp
View File

@@ -58,6 +58,8 @@
#include <QtXml/QXmlStreamReader> #include <QtXml/QXmlStreamReader>
#include <limits.h>
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Qt4ProjectManager; using namespace Qt4ProjectManager;
using namespace Qt4ProjectManager::Internal; using namespace Qt4ProjectManager::Internal;
@@ -71,7 +73,7 @@ MaemoQemuManager::MaemoQemuManager(QObject *parent)
: QObject(parent) : QObject(parent)
, m_qemuAction(0) , m_qemuAction(0)
, m_qemuProcess(new QProcess(this)) , m_qemuProcess(new QProcess(this))
, m_runningQtId(-1) , m_runningQtId(INT_MIN)
, m_userTerminated(false) , m_userTerminated(false)
{ {
m_qemuStarterIcon.addFile(":/qt-maemo/images/qemu-run.png", iconSize); m_qemuStarterIcon.addFile(":/qt-maemo/images/qemu-run.png", iconSize);
@@ -412,7 +414,7 @@ void MaemoQemuManager::terminateRuntime()
void MaemoQemuManager::qemuProcessFinished() void MaemoQemuManager::qemuProcessFinished()
{ {
m_runningQtId = -1; m_runningQtId = INT_MIN;
QemuStatus status = QemuFinished; QemuStatus status = QemuFinished;
QString error; 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); qtVersionsChanged(QList<int>() << uniqueId);
bool isRunning = m_qemuProcess->state() != QProcess::NotRunning; bool isRunning = m_qemuProcess->state() != QProcess::NotRunning;