From 281056aedf2097d04fa03b4962cd0865f7088ecc Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Date: Wed, 20 May 2015 13:41:28 +0200
Subject: [PATCH] Disambiguate name of QLocalServer used in Browser example.
Append Qt version and engine name so that it does not lock
out the QtWebKit based browser and allows for comparing
different versions of Qt.
Remove outdated section within Q_WS_QWS.
Change-Id: I754db3ce78eefea88b97960af24ae628093e3c2a
Task-number: QTBUG-46233
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
---
.../webenginewidgets/browser/browserapplication.cpp | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/examples/webenginewidgets/browser/browserapplication.cpp b/examples/webenginewidgets/browser/browserapplication.cpp
index 3bc801295..8961bf7fb 100644
--- a/examples/webenginewidgets/browser/browserapplication.cpp
+++ b/examples/webenginewidgets/browser/browserapplication.cpp
@@ -122,14 +122,8 @@ BrowserApplication::BrowserApplication(int &argc, char **argv)
QCoreApplication::setOrganizationName(QLatin1String("Qt"));
QCoreApplication::setApplicationName(QLatin1String("demobrowser"));
QCoreApplication::setApplicationVersion(QLatin1String("0.1"));
-#ifdef Q_WS_QWS
- // Use a different server name for QWS so we can run an X11
- // browser and a QWS browser in parallel on the same machine for
- // debugging
- QString serverName = QCoreApplication::applicationName() + QLatin1String("_qws");
-#else
- QString serverName = QCoreApplication::applicationName();
-#endif
+ QString serverName = QCoreApplication::applicationName()
+ + QString::fromLatin1(QT_VERSION_STR).remove('.') + QLatin1String("webengine");
QLocalSocket socket;
socket.connectToServer(serverName);
if (socket.waitForConnected(500)) {
--
GitLab