diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-02-20 13:59:30 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-02-20 13:59:30 +0100 |
| commit | d3525d33cb9085cf1ee61b437931555fe7d932ae (patch) | |
| tree | 527adee7c481769d0a77f96b25669ec86a606099 /examples | |
| parent | f3aaa7531e7b429d958e7002e642f4b59568ff74 (diff) | |
| parent | 3c356bcf7c0fd4af7fb86824276c5a170ae10ace (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: If884b8b8bc087a6a726476b49cdb48a0efaa173e
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/webenginewidgets/demobrowser/browserapplication.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/examples/webenginewidgets/demobrowser/browserapplication.cpp b/examples/webenginewidgets/demobrowser/browserapplication.cpp index 745e38865..a2e47cd9f 100644 --- a/examples/webenginewidgets/demobrowser/browserapplication.cpp +++ b/examples/webenginewidgets/demobrowser/browserapplication.cpp @@ -156,12 +156,11 @@ BrowserApplication::BrowserApplication(int &argc, char **argv) m_localServer = new QLocalServer(this); connect(m_localServer, SIGNAL(newConnection()), this, SLOT(newLocalSocketConnection())); - if (!m_localServer->listen(serverName)) { - if (m_localServer->serverError() == QAbstractSocket::AddressInUseError - && QFile::exists(m_localServer->serverName())) { - QFile::remove(m_localServer->serverName()); - m_localServer->listen(serverName); - } + if (!m_localServer->listen(serverName) + && m_localServer->serverError() == QAbstractSocket::AddressInUseError) { + QLocalServer::removeServer(serverName); + if (!m_localServer->listen(serverName)) + qWarning("Could not create local socket %s.", qPrintable(serverName)); } #ifndef QT_NO_OPENSSL |