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

QmlDebug: Remove old variant of connection failure message

Browse Source 
That must have been from Qt Quick 1 times.

Change-Id: I53044fbb6c4f9cfc412a3a44f20c75ae606bc8a8
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2015-11-19 13:15:57 +01:00
parent f877d0a9d0
commit ed85f4cfe2
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libs/qmldebug/qmldebugconstants.h
View File

@@ -38,7 +38,6 @@ const char STR_WAITING_FOR_CONNECTION[] = "Waiting for connection ";
const char STR_ON_PORT_PATTERN[] = "on port (\\d+)"; const char STR_ON_PORT_PATTERN[] = "on port (\\d+)";
const char STR_UNABLE_TO_LISTEN[] = "Unable to listen "; const char STR_UNABLE_TO_LISTEN[] = "Unable to listen ";
const char STR_IGNORING_DEBUGGER[] = "Ignoring \"-qmljsdebugger="; const char STR_IGNORING_DEBUGGER[] = "Ignoring \"-qmljsdebugger=";
const char STR_IGNORING_DEBUGGER2[] = "Ignoring\"-qmljsdebugger="; // There is (was?) a bug in one of the error strings - safest to handle both
const char STR_CONNECTION_ESTABLISHED[] = "Connection established"; const char STR_CONNECTION_ESTABLISHED[] = "Connection established";
const char STR_CONNECTING_TO_SOCKET[] = "Connecting to socket"; const char STR_CONNECTING_TO_SOCKET[] = "Connecting to socket";

3
src/libs/qmldebug/qmloutputparser.cpp
View File

@@ -77,7 +77,6 @@ void QmlOutputParser::processOutput(const QString &output)
static QString waitingForConnection = QLatin1String(Constants::STR_WAITING_FOR_CONNECTION); static QString waitingForConnection = QLatin1String(Constants::STR_WAITING_FOR_CONNECTION);
static QString unableToListen = QLatin1String(Constants::STR_UNABLE_TO_LISTEN); static QString unableToListen = QLatin1String(Constants::STR_UNABLE_TO_LISTEN);
static QString debuggingNotEnabled = QLatin1String(Constants::STR_IGNORING_DEBUGGER); static QString debuggingNotEnabled = QLatin1String(Constants::STR_IGNORING_DEBUGGER);
static QString debuggingNotEnabled2 = QLatin1String(Constants::STR_IGNORING_DEBUGGER2);
static QString connectionEstablished = QLatin1String(Constants::STR_CONNECTION_ESTABLISHED); static QString connectionEstablished = QLatin1String(Constants::STR_CONNECTION_ESTABLISHED);
static QString connectingToSocket = QLatin1String(Constants::STR_CONNECTING_TO_SOCKET); static QString connectingToSocket = QLatin1String(Constants::STR_CONNECTING_TO_SOCKET);
@@ -96,7 +95,7 @@ void QmlOutputParser::processOutput(const QString &output)
} else if (status.startsWith(unableToListen)) { } else if (status.startsWith(unableToListen)) {
//: Error message shown after 'Could not connect ... debugger:" //: Error message shown after 'Could not connect ... debugger:"
emit errorMessage(tr("The port seems to be in use.")); emit errorMessage(tr("The port seems to be in use."));
} else if (status.startsWith(debuggingNotEnabled) || status.startsWith(debuggingNotEnabled2)) { } else if (status.startsWith(debuggingNotEnabled)) {
//: Error message shown after 'Could not connect ... debugger:" //: Error message shown after 'Could not connect ... debugger:"
emit errorMessage(tr("The application is not set up for QML/JS debugging.")); emit errorMessage(tr("The application is not set up for QML/JS debugging."));
} else if (status.startsWith(connectionEstablished)) { } else if (status.startsWith(connectionEstablished)) {