From f5230ca1daad6923e4f307e82337bf93424b73a4 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 20 May 2015 13:26:23 +0200 Subject: Disambiguate name of QLocalServer used in Browser example. Append Qt version and engine name so that it does not lock out the QtWebEngine based browser and allows for comparing different versions of Qt. Change-Id: Id904d2760dbf44777327b6b21847caf35a811e59 Task-number: QTBUG-46233 Reviewed-by: Allan Sandfeld Jensen --- examples/webkitwidgets/browser/browserapplication.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/webkitwidgets/browser/browserapplication.cpp b/examples/webkitwidgets/browser/browserapplication.cpp index 1c7ef63..37d2e43 100644 --- a/examples/webkitwidgets/browser/browserapplication.cpp +++ b/examples/webkitwidgets/browser/browserapplication.cpp @@ -115,7 +115,8 @@ BrowserApplication::BrowserApplication(int &argc, char **argv) m_correctlyInitialized = true; - QString serverName = QCoreApplication::applicationName(); + QString serverName = QCoreApplication::applicationName() + + QString::fromLatin1(QT_VERSION_STR).remove('.') + QLatin1String("webkit"); QLocalSocket socket; socket.connectToServer(serverName); if (socket.waitForConnected(500)) { -- cgit v1.2.3