Updated our copy of QtSingleApplication.

CMakeLists.txt

@@ -440,6 +440,11 @@ ENDIF()
 
 ADD_DEFINITIONS(-DQT_DEPRECATED_WARNINGS)
 
+# Make sure that Unicode is defined
+# Note: at least needed for QtSingleApplication on Windows...
+
+ADD_DEFINITIONS(-DUNICODE)
+
 # Let OpenCOR know about some of the options with which it was built
 
 IF(USE_PREBUILT_QTWEBKIT_PACKAGE)

scripts/traviscilinuxinstall

@@ -4,7 +4,7 @@ RUN apt -y -qq update
 
 RUN apt -y install software-properties-common
 
-RUN apt-add-repository -y ppa:beineri/opt-qt591-xenial
+RUN apt-add-repository -y ppa:beineri/opt-qt592-xenial
 
 RUN apt -y -qq update
 RUN apt -y -qq install cmake g++-5 git libgl1-mesa-dev libglu1-mesa-dev ninja-build

src/3rdparty/QtSingleApplication/src/qtlocalpeer.cpp

@@ -45,9 +45,6 @@
 #include <QTime>
 
 #if defined(Q_OS_WIN)
-//---OPENCOR--- BEGIN
-#define UNICODE
-//---OPENCOR--- END
 #include <QLibrary>
 #include <qt_windows.h>
 typedef BOOL(WINAPI*PProcessIdToSessionId)(DWORD,DWORD*);
@@ -180,12 +177,7 @@ void QtLocalPeer::receiveConnection()
         return;
 
     while (true) {
-/*---OPENCOR---
-        if (socket->state() == QAbstractSocket::UnconnectedState) {
-*/
-//---OPENCOR--- BEGIN
-        if (int(socket->state()) == QAbstractSocket::UnconnectedState) {
-//---OPENCOR--- END
+        if (socket->state() == QLocalSocket::UnconnectedState) {
             qWarning("QtLocalPeer: Peer disconnected");
             delete socket;
             return;