diff options
Diffstat (limited to 'examples/webkitwidgets/browser/browserapplication.cpp')
| -rw-r--r-- | examples/webkitwidgets/browser/browserapplication.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/examples/webkitwidgets/browser/browserapplication.cpp b/examples/webkitwidgets/browser/browserapplication.cpp index 3166e97..37d2e43 100644 --- a/examples/webkitwidgets/browser/browserapplication.cpp +++ b/examples/webkitwidgets/browser/browserapplication.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -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) { |