diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-03 10:59:49 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-03 10:59:49 +0200 |
| commit | 27a822a088991c2d92a4b31f86c86dc6692fa055 (patch) | |
| tree | 271289873262d7c5aaa4b520a7ad8b2b5cec6c39 /examples/webkitwidgets/browser/browserapplication.cpp | |
| parent | 98d82b4cd928bcf9ccc5ad0dc122770aaaf232ef (diff) | |
| parent | f5230ca1daad6923e4f307e82337bf93424b73a4 (diff) | |
| download | qtwebkit-examples-27a822a088991c2d92a4b31f86c86dc6692fa055.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I03ffc970213da3aacf20a8f0ed2f585997af8a2b
Diffstat (limited to 'examples/webkitwidgets/browser/browserapplication.cpp')
| -rw-r--r-- | examples/webkitwidgets/browser/browserapplication.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/examples/webkitwidgets/browser/browserapplication.cpp b/examples/webkitwidgets/browser/browserapplication.cpp index 05d277e..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)) { @@ -201,7 +202,7 @@ void BrowserApplication::quitBrowser() clean(); int tabCount = 0; for (int i = 0; i < m_mainWindows.count(); ++i) { - tabCount =+ m_mainWindows.at(i)->tabWidget()->count(); + tabCount += m_mainWindows.at(i)->tabWidget()->count(); } if (tabCount > 1) { |