diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-05-20 13:26:23 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-05-20 11:59:50 +0000 |
| commit | f5230ca1daad6923e4f307e82337bf93424b73a4 (patch) | |
| tree | 8a67d76a04128035a757fc30ea123849ec311fe4 | |
| parent | 0dc8719647eca19fd0828a86f5e61d21e0b774ad (diff) | |
| download | qtwebkit-examples-f5230ca1daad6923e4f307e82337bf93424b73a4.tar.gz | |
Disambiguate name of QLocalServer used in Browser example.v5.5.0-rc1v5.5.05.5.0
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 <allan.jensen@theqtcompany.com>
| -rw-r--r-- | examples/webkitwidgets/browser/browserapplication.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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)) { |