Migration from Qt4 to Qt5

giowck · May 8, 2016 · 333d3b3 · 333d3b3
1 parent c104f11
commit 333d3b3
Show file tree

Hide file tree

Showing 269 changed files with 460 additions and 397 deletions.
diff --git a/AUTHORS b/AUTHORS
diff --git a/CHANGELOG b/CHANGELOG
diff --git a/Doxyfile b/Doxyfile
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/Symphytum.pro b/Symphytum.pro
@@ -4,7 +4,7 @@
 #
 #-------------------------------------------------
 
-QT       += core gui sql network svg
+QT       += core gui sql network svg widgets printsupport
 
 macx {
     TARGET = Symphytum

diff --git a/components/alarmmanager.cpp b/components/alarmmanager.cpp
diff --git a/components/alarmmanager.h b/components/alarmmanager.h
diff --git a/components/backupmanager.cpp b/components/backupmanager.cpp
@@ -400,8 +400,6 @@ void BackupManager::createBackupThreadConnections(QThread *thread,
     //thread delete
     connect(thread, SIGNAL(finished()),
             thread, SLOT(deleteLater()));
-    connect(thread, SIGNAL(terminated()),
-            thread, SLOT(deleteLater()));
 
     //backupTask signals
     connect(backupTask, SIGNAL(errorSignal(QString)),

diff --git a/components/backupmanager.h b/components/backupmanager.h
diff --git a/components/databasemanager.cpp b/components/databasemanager.cpp
@@ -16,7 +16,7 @@
 #include <QtSql/QSqlQuery>
 #include <QtSql/QSqlError>
 #include <QtCore/QVariant>
-#include <QtGui/QMessageBox>
+#include <QtWidgets/QMessageBox>
 #include <QtGui/QDesktopServices>
 #include <QtCore/QDir>
 
@@ -127,8 +127,8 @@ QString DatabaseManager::getDatabasePath()
 
 DatabaseManager::DatabaseManager()
 {
-    QString dataDir = QDesktopServices::storageLocation(
-                QDesktopServices::DataLocation);
+    QString dataDir = QStandardPaths::standardLocations(
+                QStandardPaths::DataLocation).at(0);
     m_databaseName = "data.db";
     m_databasePath = dataDir.append("/");
     m_databasePath.append(m_databaseName);

diff --git a/components/databasemanager.h b/components/databasemanager.h
diff --git a/components/filemanager.cpp b/components/filemanager.cpp
@@ -16,7 +16,7 @@
 #include <QtCore/QDir>
 #include <QtCore/QFile>
 #include <QtCore/QThread>
-#include <QtGui/QMessageBox>
+#include <QtWidgets/QMessageBox>
 #include <QtCore/QDateTime>
 #include <QtCore/QCryptographicHash>
 #include <QtGui/QDesktopServices>
@@ -90,11 +90,11 @@ void FileTask::startFileOp()
 FileManager::FileManager(QObject *parent) :
     QObject(parent), m_fileOpThread(0)
 {
-    QString dataDir = QDesktopServices::storageLocation(
-                QDesktopServices::DataLocation);
-#ifdef Q_WS_WIN
+    QString dataDir = QStandardPaths::standardLocations(
+                QStandardPaths::DataLocation).at(0);
+#ifdef Q_OS_WIN
     dataDir.replace("\\", "/");
-#endif // Q_WS_WIN
+#endif // Q_OS_WIN
     if (!QDir(dataDir).exists()) {
         QDir::current().mkpath(dataDir);
     }
@@ -465,8 +465,6 @@ void FileManager::createFileThreadConnections(QThread *thread,
     //thread delete
     connect(thread, SIGNAL(finished()),
             thread, SLOT(deleteLater()));
-    connect(thread, SIGNAL(terminated()),
-            thread, SLOT(deleteLater()));
 
     //fileTask signals
     connect(fileTask, SIGNAL(errorSignal(QString)),

diff --git a/components/filemanager.h b/components/filemanager.h
diff --git a/components/formlayoutmatrix.cpp b/components/formlayoutmatrix.cpp
diff --git a/components/formlayoutmatrix.h b/components/formlayoutmatrix.h
diff --git a/components/metadataengine.cpp b/components/metadataengine.cpp
diff --git a/components/metadataengine.h b/components/metadataengine.h
diff --git a/components/settingsmanager.cpp b/components/settingsmanager.cpp
diff --git a/components/settingsmanager.h b/components/settingsmanager.h
diff --git a/components/sync_framework/abstractsyncdriver.cpp b/components/sync_framework/abstractsyncdriver.cpp
diff --git a/components/sync_framework/abstractsyncdriver.h b/components/sync_framework/abstractsyncdriver.h
diff --git a/components/sync_framework/dropboxsyncdriver.cpp b/components/sync_framework/dropboxsyncdriver.cpp
@@ -10,7 +10,7 @@
 #include "../settingsmanager.h"
 
 #include <QtCore/QFileInfo>
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 
 
 //-----------------------------------------------------------------------------
@@ -190,7 +190,7 @@ void DropboxSyncDriver::processFinished(int exitCode,
                             token = list.at(i + 1);
                     }
                 }
-                QString encodedToken = QString(token.toAscii().toBase64());
+                QString encodedToken = QString(token.toLatin1().toBase64());
                 m_accessTokenEncoded = encodedToken;
                 SettingsManager s;
                 s.saveEncodedAccessToken(encodedToken);
@@ -324,11 +324,11 @@ void DropboxSyncDriver::startRequest()
     QString accessToken;
     QString command;
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
     pythonInterpreterPath = QApplication::applicationDirPath()
             .append("/sync/").append("dropbox_client.exe");
 #endif
-#ifdef Q_WS_MAC
+#ifdef Q_OS_OSX
     if (QSysInfo::MacintoshVersion <= QSysInfo::MV_10_6)
         pythonInterpreterPath = "python2.6";
     else
@@ -337,14 +337,14 @@ void DropboxSyncDriver::startRequest()
     path.append("dropbox_client.py");
     args.append(path);
 #endif
-#ifdef Q_WS_X11
+#ifdef Q_OS_LINUX
     pythonInterpreterPath = "python2";
     args.append("/usr/share/symphytum/sync/dropbox_client.py");
 #endif
 
     //decode access token
     accessToken = QString(
-                QByteArray::fromBase64(m_accessTokenEncoded.toAscii()));
+                QByteArray::fromBase64(m_accessTokenEncoded.toLatin1()));
 
     //decode app secret
     QString s2;
@@ -357,7 +357,7 @@ void DropboxSyncDriver::startRequest()
         s1.append(m_appSecretEncoded.at(i));
     }
     QString e = s1 + s2;
-    appSecret = QString(QByteArray::fromBase64(e.toAscii()));
+    appSecret = QString(QByteArray::fromBase64(e.toLatin1()));
 
     //init command and etra args
     QStringList extraArgs; //extra arguments for specific command

diff --git a/components/sync_framework/dropboxsyncdriver.h b/components/sync_framework/dropboxsyncdriver.h
diff --git a/components/sync_framework/scripts/dropbox_client.py b/components/sync_framework/scripts/dropbox_client.py
diff --git a/components/sync_framework/syncengine.cpp b/components/sync_framework/syncengine.cpp
@@ -476,8 +476,8 @@ SyncEngine::SyncEngine(QObject *parent) :
     m_currentEngineOperation(NoSpecialOp),
     m_cloudSessionOpened(false)
 {
-    QString dataDir = QDesktopServices::storageLocation(
-                QDesktopServices::DataLocation);
+    QString dataDir = QStandardPaths::standardLocations(
+                QStandardPaths::DataLocation).at(0);
     m_metadataFileName = "sync.meta";
     m_metadataFilePath = dataDir.append("/");
     m_metadataFilePath.append(m_metadataFileName);

diff --git a/components/sync_framework/syncengine.h b/components/sync_framework/syncengine.h
diff --git a/components/sync_framework/syncsession.cpp b/components/sync_framework/syncsession.cpp
diff --git a/components/sync_framework/syncsession.h b/components/sync_framework/syncsession.h
diff --git a/components/undocommands.cpp b/components/undocommands.cpp
diff --git a/components/undocommands.h b/components/undocommands.h
@@ -13,7 +13,7 @@
 // Headers
 //-----------------------------------------------------------------------------
 
-#include <QtGui/QUndoCommand>
+#include <QtWidgets/QUndoCommand>
 #include <QtCore/QVariant>
 #include <QtCore/QList>
 

diff --git a/components/updatemanager.cpp b/components/updatemanager.cpp
@@ -13,8 +13,8 @@
 #include <QtNetwork/QNetworkRequest>
 #include <QtNetwork/QNetworkReply>
 #include <QtCore/QStringList>
-#include <QtGui/QMessageBox>
-#include <QtGui/QApplication>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QApplication>
 #include <QtGui/QDesktopServices>
 
 

diff --git a/components/updatemanager.h b/components/updatemanager.h
diff --git a/doc/deployment/README b/doc/deployment/README
diff --git a/doc/deployment/pyinstaller dropbox howto b/doc/deployment/pyinstaller dropbox howto
diff --git a/doc/design/HACKING b/doc/design/HACKING
diff --git a/doc/design/Standard Database Design b/doc/design/Standard Database Design
diff --git a/doc/translation/README b/doc/translation/README
diff --git a/main.cpp b/main.cpp
diff --git a/models/collectionlistmodel.cpp b/models/collectionlistmodel.cpp
diff --git a/models/collectionlistmodel.h b/models/collectionlistmodel.h
diff --git a/models/standardmodel.cpp b/models/standardmodel.cpp
diff --git a/models/standardmodel.h b/models/standardmodel.h
diff --git a/models/testmodel.cpp b/models/testmodel.cpp
diff --git a/models/testmodel.h b/models/testmodel.h
diff --git a/resources/images/icons/LICENSE b/resources/images/icons/LICENSE
diff --git a/resources/images/icons/add.png b/resources/images/icons/add.png
diff --git a/resources/images/icons/alarm.png b/resources/images/icons/alarm.png
diff --git a/resources/images/icons/collectionlistitem.png b/resources/images/icons/collectionlistitem.png
diff --git a/resources/images/icons/deletecollection.png b/resources/images/icons/deletecollection.png
diff --git a/resources/images/icons/deletefield.png b/resources/images/icons/deletefield.png
diff --git a/resources/images/icons/deleterecord.png b/resources/images/icons/deleterecord.png
diff --git a/resources/images/icons/draghere.png b/resources/images/icons/draghere.png
diff --git a/resources/images/icons/dropbox.png b/resources/images/icons/dropbox.png
diff --git a/resources/images/icons/duplicatefield.png b/resources/images/icons/duplicatefield.png
diff --git a/resources/images/icons/duplicaterecord.png b/resources/images/icons/duplicaterecord.png
diff --git a/resources/images/icons/export.png b/resources/images/icons/export.png
diff --git a/resources/images/icons/initConflict.png b/resources/images/icons/initConflict.png
diff --git a/resources/images/icons/newcollection.png b/resources/images/icons/newcollection.png
diff --git a/resources/images/icons/newfield.png b/resources/images/icons/newfield.png
diff --git a/resources/images/icons/newrecord.png b/resources/images/icons/newrecord.png
diff --git a/resources/images/icons/nextrecord.png b/resources/images/icons/nextrecord.png
diff --git a/resources/images/icons/previousrecord.png b/resources/images/icons/previousrecord.png
diff --git a/resources/images/icons/remove.png b/resources/images/icons/remove.png
diff --git a/resources/images/icons/revConflict.png b/resources/images/icons/revConflict.png
diff --git a/resources/images/icons/settings_advanced.png b/resources/images/icons/settings_advanced.png
diff --git a/resources/images/icons/settings_appearance.png b/resources/images/icons/settings_appearance.png
diff --git a/resources/images/icons/settings_general.png b/resources/images/icons/settings_general.png
diff --git a/resources/images/icons/symphytum.icns b/resources/images/icons/symphytum.icns
diff --git a/resources/images/icons/symphytum.ico b/resources/images/icons/symphytum.ico
diff --git a/resources/images/icons/symphytum.png b/resources/images/icons/symphytum.png
diff --git a/resources/images/icons/sync.png b/resources/images/icons/sync.png
diff --git a/resources/images/sample/LICENSE b/resources/images/sample/LICENSE
diff --git a/resources/images/sample/calendula.jpg b/resources/images/sample/calendula.jpg
diff --git a/resources/images/sample/coffea.jpg b/resources/images/sample/coffea.jpg
diff --git a/resources/images/sample/symphytum.jpg b/resources/images/sample/symphytum.jpg
diff --git a/resources/languages/qt_de.qm b/resources/languages/qt_de.qm
diff --git a/resources/languages/symphytum_de.qm b/resources/languages/symphytum_de.qm
diff --git a/resources/languages/symphytum_it.qm b/resources/languages/symphytum_it.qm
diff --git a/resources/resources.qrc b/resources/resources.qrc
diff --git a/resources/src/icons/LICENSE b/resources/src/icons/LICENSE
diff --git a/resources/src/icons/README b/resources/src/icons/README
diff --git a/resources/src/icons/searchline_clear.svg b/resources/src/icons/searchline_clear.svg
diff --git a/resources/src/icons/searchline_icon.svg b/resources/src/icons/searchline_icon.svg
diff --git a/stuff/3rdparty_licenses.html b/stuff/3rdparty_licenses.html
diff --git a/stuff/dropbox-python-sdk/dropbox-python-sdk-1.5.1.zip b/stuff/dropbox-python-sdk/dropbox-python-sdk-1.5.1.zip
diff --git a/stuff/dropbox-python-sdk/patches/chunked_upload_output.patch b/stuff/dropbox-python-sdk/patches/chunked_upload_output.patch
diff --git a/stuff/installers/PKGBUILD b/stuff/installers/PKGBUILD
diff --git a/stuff/installers/deb/usr/share/pixmaps/symphytum.png b/stuff/installers/deb/usr/share/pixmaps/symphytum.png
diff --git a/stuff/installers/deb/usr/share/pixmaps/symphytum.xpm b/stuff/installers/deb/usr/share/pixmaps/symphytum.xpm
diff --git a/stuff/installers/deb/usr/share/symphytum/sync/dropbox/__init__.pyc b/stuff/installers/deb/usr/share/symphytum/sync/dropbox/__init__.pyc
diff --git a/stuff/installers/deb/usr/share/symphytum/sync/dropbox/client.pyc b/stuff/installers/deb/usr/share/symphytum/sync/dropbox/client.pyc
diff --git a/stuff/installers/deb/usr/share/symphytum/sync/dropbox/rest.pyc b/stuff/installers/deb/usr/share/symphytum/sync/dropbox/rest.pyc
diff --git a/stuff/installers/deb/usr/share/symphytum/sync/dropbox/session.pyc b/stuff/installers/deb/usr/share/symphytum/sync/dropbox/session.pyc
diff --git a/stuff/installers/deb/usr/share/symphytum/sync/dropbox/six.pyc b/stuff/installers/deb/usr/share/symphytum/sync/dropbox/six.pyc
diff --git a/stuff/installers/deb/usr/share/symphytum/sync/dropbox/util.py b/stuff/installers/deb/usr/share/symphytum/sync/dropbox/util.py
diff --git a/stuff/installers/deb/usr/share/symphytum/sync/dropbox/util.pyc b/stuff/installers/deb/usr/share/symphytum/sync/dropbox/util.pyc
diff --git a/stuff/installers/deb/usr/share/symphytum/sync/dropbox_client.py b/stuff/installers/deb/usr/share/symphytum/sync/dropbox_client.py
diff --git a/stuff/installers/deb/usr/share/symphytum/sync/dropbox_client.pyc b/stuff/installers/deb/usr/share/symphytum/sync/dropbox_client.pyc
diff --git a/stuff/installers/dmg/dmgback.png b/stuff/installers/dmg/dmgback.png
diff --git a/stuff/installers/dmg/dmgback.xcf b/stuff/installers/dmg/dmgback.xcf
diff --git a/stuff/installers/dmg/g29827.png b/stuff/installers/dmg/g29827.png
diff --git a/stuff/installers/symphytum.iss b/stuff/installers/symphytum.iss
diff --git a/stuff/logo/symphytum.png b/stuff/logo/symphytum.png
diff --git a/stuff/logo/symphytum_64.png b/stuff/logo/symphytum_64.png
diff --git a/stuff/pyinstaller-1.5.1.zip b/stuff/pyinstaller-1.5.1.zip
diff --git a/stuff/translations/symphytum_de.ts b/stuff/translations/symphytum_de.ts
diff --git a/stuff/translations/symphytum_it.ts b/stuff/translations/symphytum_it.ts
diff --git a/tests/DatabaseManager/DatabaseManager.pro b/tests/DatabaseManager/DatabaseManager.pro
diff --git a/tests/DatabaseManager/tst_databasemanagertest.cpp b/tests/DatabaseManager/tst_databasemanagertest.cpp
diff --git a/tests/FormLayoutMatrix/FormLayoutMatrix.pro b/tests/FormLayoutMatrix/FormLayoutMatrix.pro
diff --git a/tests/FormLayoutMatrix/tst_formlayoutmatrixtest.cpp b/tests/FormLayoutMatrix/tst_formlayoutmatrixtest.cpp
diff --git a/tests/FormLayoutState/FormLayoutState.pro b/tests/FormLayoutState/FormLayoutState.pro
diff --git a/tests/FormLayoutState/tst_formlayoutstatetest.cpp b/tests/FormLayoutState/tst_formlayoutstatetest.cpp
diff --git a/tests/FormWidgetValidator/FormWidgetValidator.pro b/tests/FormWidgetValidator/FormWidgetValidator.pro
diff --git a/tests/FormWidgetValidator/tst_formwidgetvalidatortest.cpp b/tests/FormWidgetValidator/tst_formwidgetvalidatortest.cpp
diff --git a/tests/MetadataEngine/MetadataEngine.pro b/tests/MetadataEngine/MetadataEngine.pro
diff --git a/tests/MetadataEngine/tst_metadataenginetest.cpp b/tests/MetadataEngine/tst_metadataenginetest.cpp
diff --git a/tests/MetadataPropertiesParser/MetadataPropertiesParser.pro b/tests/MetadataPropertiesParser/MetadataPropertiesParser.pro
diff --git a/tests/MetadataPropertiesParser/tst_metadatapropertiesparsertest.cpp b/tests/MetadataPropertiesParser/tst_metadatapropertiesparsertest.cpp
diff --git a/ui/aboutdialog.ui b/ui/aboutdialog.ui
diff --git a/ui/addfielddialog.ui b/ui/addfielddialog.ui
diff --git a/ui/alarmlistdialog.ui b/ui/alarmlistdialog.ui
diff --git a/ui/backupdialog.ui b/ui/backupdialog.ui
diff --git a/ui/checkboxfieldwizard.ui b/ui/checkboxfieldwizard.ui
diff --git a/ui/comboboxfieldwizard.ui b/ui/comboboxfieldwizard.ui
diff --git a/ui/creationdatefieldwizard.ui b/ui/creationdatefieldwizard.ui
diff --git a/ui/datefieldwizard.ui b/ui/datefieldwizard.ui
diff --git a/ui/emptyformwidget.ui b/ui/emptyformwidget.ui
diff --git a/ui/exportdialog.ui b/ui/exportdialog.ui
diff --git a/ui/filesfieldwizard.ui b/ui/filesfieldwizard.ui
diff --git a/ui/imagefieldwizard.ui b/ui/imagefieldwizard.ui
diff --git a/ui/importdialog.ui b/ui/importdialog.ui
diff --git a/ui/moddatefieldwizard.ui b/ui/moddatefieldwizard.ui
diff --git a/ui/numberfieldwizard.ui b/ui/numberfieldwizard.ui
diff --git a/ui/preferencesdialog.ui b/ui/preferencesdialog.ui
diff --git a/ui/printdialog.ui b/ui/printdialog.ui
diff --git a/ui/progressfieldwizard.ui b/ui/progressfieldwizard.ui
diff --git a/ui/syncconfigdialog.ui b/ui/syncconfigdialog.ui
diff --git a/ui/syncprocessdialog.ui b/ui/syncprocessdialog.ui
diff --git a/ui/textfieldwizard.ui b/ui/textfieldwizard.ui
diff --git a/utils/collectionfieldcleaner.cpp b/utils/collectionfieldcleaner.cpp
diff --git a/utils/collectionfieldcleaner.h b/utils/collectionfieldcleaner.h
diff --git a/utils/definitionholder.cpp b/utils/definitionholder.cpp
diff --git a/utils/definitionholder.h b/utils/definitionholder.h
diff --git a/utils/formviewlayoutstate.cpp b/utils/formviewlayoutstate.cpp
diff --git a/utils/formviewlayoutstate.h b/utils/formviewlayoutstate.h
diff --git a/utils/formwidgetvalidator.cpp b/utils/formwidgetvalidator.cpp
diff --git a/utils/formwidgetvalidator.h b/utils/formwidgetvalidator.h
diff --git a/utils/maclionfullscreenprovider.h b/utils/maclionfullscreenprovider.h
diff --git a/utils/maclionfullscreenprovider.mm b/utils/maclionfullscreenprovider.mm
@@ -8,39 +8,39 @@
 
 #include "maclionfullscreenprovider.h"
 
-#include <QtGui/QMainWindow>
+#include <QtWidgets/QMainWindow>
 
 
 //-----------------------------------------------------------------------------
 // Public
 //-----------------------------------------------------------------------------
 
 void MacLionFullscreenProvider::enableWindow(QMainWindow *window)
-{
+{/*
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
     NSView *nsview = (NSView *) window->winId();
     NSWindow *nswindow = [nsview window];
     [nswindow setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
-#endif
+#endif*/
 }
 
 void MacLionFullscreenProvider::toggleFullscreen(QMainWindow *window)
-{
+{/*
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
     NSView *nsview = (NSView *) window->winId();
     NSWindow *nswindow = [nsview window];
     [nswindow toggleFullScreen:nil];
-#endif
+#endif*/
 }
 
 bool MacLionFullscreenProvider::isFullScreen(QMainWindow *window)
 {
-    bool result;
+    bool result;/*
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
     NSView *nsview = (NSView *) window->winId();
     NSWindow *nswindow = [nsview window];
     NSUInteger masks = [nswindow styleMask];
     result = masks & NSFullScreenWindowMask;
-#endif
+#endif*/
     return result;
 }
diff --git a/utils/metadatapropertiesparser.cpp b/utils/metadatapropertiesparser.cpp
diff --git a/utils/metadatapropertiesparser.h b/utils/metadatapropertiesparser.h
diff --git a/utils/platformcolorservice.cpp b/utils/platformcolorservice.cpp
diff --git a/utils/platformcolorservice.h b/utils/platformcolorservice.h
diff --git a/utils/qtsingleapplication/QtLockedFile b/utils/qtsingleapplication/QtLockedFile
@@ -0,0 +1 @@
+#include "qtlockedfile.h"
diff --git a/utils/qtsingleapplication/QtSingleApplication b/utils/qtsingleapplication/QtSingleApplication
@@ -0,0 +1 @@
+#include "qtsingleapplication.h"
diff --git a/utils/qtsingleapplication/qtlocalpeer.cpp b/utils/qtsingleapplication/qtlocalpeer.cpp
@@ -1,12 +1,11 @@
 /****************************************************************************
 **
-** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of a Qt Solutions component.
+** This file is part of the Qt Solutions component.
 **
+** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
@@ -18,10 +17,10 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
 **
 ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -35,20 +34,23 @@
 ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 **
+** $QT_END_LICENSE$
+**
 ****************************************************************************/
 
 
 #include "qtlocalpeer.h"
-#include <QtCore/QCoreApplication>
-#include <QtCore/QTime>
+#include <QCoreApplication>
+#include <QDataStream>
+#include <QTime>
 
 #if defined(Q_OS_WIN)
-#include <QtCore/QLibrary>
-#include <QtCore/qt_windows.h>
+#include <QLibrary>
+#include <qt_windows.h>
 typedef BOOL(WINAPI*PProcessIdToSessionId)(DWORD,DWORD*);
 static PProcessIdToSessionId pProcessIdToSessionId = 0;
 #endif
-#if defined(Q_OS_UNIX) //see bug https://bugreports.qt-project.org/browse/QTSOLBUG-102
+#if defined(Q_OS_UNIX)
 #include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
@@ -196,6 +198,7 @@ void QtLocalPeer::receiveConnection()
     QString message(QString::fromUtf8(uMsg));
     socket->write(ack, qstrlen(ack));
     socket->waitForBytesWritten(1000);
+    socket->waitForDisconnected(1000); // make sure client reads ack
     delete socket;
     emit messageReceived(message); //### (might take a long time to return)
 }
diff --git a/utils/qtsingleapplication/qtlocalpeer.h b/utils/qtsingleapplication/qtlocalpeer.h
@@ -1,12 +1,11 @@
 /****************************************************************************
 **
-** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of a Qt Solutions component.
+** This file is part of the Qt Solutions component.
 **
+** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
@@ -18,10 +17,10 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
 **
 ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -35,14 +34,16 @@
 ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 **
+** $QT_END_LICENSE$
+**
 ****************************************************************************/
 
 #ifndef QTLOCALPEER_H
 #define QTLOCALPEER_H
 
-#include <QtNetwork/QLocalServer>
-#include <QtNetwork/QLocalSocket>
-#include <QtCore/QDir>
+#include <QLocalServer>
+#include <QLocalSocket>
+#include <QDir>
 
 #include "qtlockedfile.h"
 

diff --git a/utils/qtsingleapplication/qtlockedfile.cpp b/utils/qtsingleapplication/qtlockedfile.cpp
@@ -1,12 +1,11 @@
 /****************************************************************************
 **
-** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of a Qt Solutions component.
+** This file is part of the Qt Solutions component.
 **
+** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
@@ -18,10 +17,10 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
 **
 ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -35,6 +34,8 @@
 ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 **
+** $QT_END_LICENSE$
+**
 ****************************************************************************/
 
 #include "qtlockedfile.h"