From 1e1f8d797342df91fcff1a7ba677a4d12b12dcfa Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 3 Feb 2011 17:41:28 +0100 Subject: [PATCH] Work around silly gcc warning. --- src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp index 41fea34e021..a81b5a00541 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp @@ -287,7 +287,7 @@ void S60DeployStep::start() || m_channel == S60DeployConfiguration::CommunicationCodaSerialConnection); bool trkClient = m_channel == S60DeployConfiguration::CommunicationTrkSerialConnection; - if (serialConnection && m_serialPortName.isEmpty() + if ((serialConnection && m_serialPortName.isEmpty()) || (trkClient && !m_launcher)) { errorMessage = tr("No device is connected. Please connect a device and try again."); reportError(errorMessage);