From ed85f4cfe205115bb7a34cd89d6ac1a134316a66 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@theqtcompany.com>
Date: Thu, 19 Nov 2015 13:15:57 +0100
Subject: [PATCH] QmlDebug: Remove old variant of connection failure message
That must have been from Qt Quick 1 times.
Change-Id: I53044fbb6c4f9cfc412a3a44f20c75ae606bc8a8
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
---
src/libs/qmldebug/qmldebugconstants.h | 1 -
src/libs/qmldebug/qmloutputparser.cpp | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/libs/qmldebug/qmldebugconstants.h b/src/libs/qmldebug/qmldebugconstants.h
index b1d59e39740..bd73cd0c989 100644
--- a/src/libs/qmldebug/qmldebugconstants.h
+++ b/src/libs/qmldebug/qmldebugconstants.h
@@ -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_UNABLE_TO_LISTEN[] = "Unable to listen ";
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_CONNECTING_TO_SOCKET[] = "Connecting to socket";
diff --git a/src/libs/qmldebug/qmloutputparser.cpp b/src/libs/qmldebug/qmloutputparser.cpp
index e0e2e1d3c63..b6c5e98a983 100644
--- a/src/libs/qmldebug/qmloutputparser.cpp
+++ b/src/libs/qmldebug/qmloutputparser.cpp
@@ -77,7 +77,6 @@ void QmlOutputParser::processOutput(const QString &output)
static QString waitingForConnection = QLatin1String(Constants::STR_WAITING_FOR_CONNECTION);
static QString unableToListen = QLatin1String(Constants::STR_UNABLE_TO_LISTEN);
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 connectingToSocket = QLatin1String(Constants::STR_CONNECTING_TO_SOCKET);
@@ -96,7 +95,7 @@ void QmlOutputParser::processOutput(const QString &output)
} else if (status.startsWith(unableToListen)) {
//: Error message shown after 'Could not connect ... debugger:"
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:"
emit errorMessage(tr("The application is not set up for QML/JS debugging."));
} else if (status.startsWith(connectionEstablished)) {
--
GitLab