File qtsingleapplication-remove-included-qtlockedfil... of Package qtsingleapplication

Overview Repositories Revisions Requests Users Attributes Meta

File qtsingleapplication-remove-included-qtlockedfile.patch of Package qtsingleapplication

Index: qtsingleapplication-2.6.1+git20180716/src/qtlocalpeer.cpp
===================================================================
--- qtsingleapplication-2.6.1+git20180716.orig/src/qtlocalpeer.cpp
+++ qtsingleapplication-2.6.1+git20180716/src/qtlocalpeer.cpp
@@ -56,15 +56,6 @@ static PProcessIdToSessionId pProcessIdT
 #include <unistd.h>
 #endif
 
-namespace QtLP_Private {
-#include "qtlockedfile.cpp"
-#if defined(Q_OS_WIN)
-#include "qtlockedfile_win.cpp"
-#else
-#include "qtlockedfile_unix.cpp"
-#endif
-}
-
 const char* QtLocalPeer::ack = "ack";
 
 QtLocalPeer::QtLocalPeer(QObject* parent, const QString &appId)
@@ -115,7 +106,7 @@ bool QtLocalPeer::isClient()
     if (lockFile.isLocked())
         return false;
 
-    if (!lockFile.lock(QtLP_Private::QtLockedFile::WriteLock, false))
+    if (!lockFile.lock(QtLockedFile::WriteLock, false))
         return true;
 
     bool res = server->listen(socketName);
Index: qtsingleapplication-2.6.1+git20180716/src/qtlocalpeer.h
===================================================================
--- qtsingleapplication-2.6.1+git20180716.orig/src/qtlocalpeer.h
+++ qtsingleapplication-2.6.1+git20180716/src/qtlocalpeer.h
@@ -68,7 +68,7 @@ protected:
     QString id;
     QString socketName;
     QLocalServer* server;
-    QtLP_Private::QtLockedFile lockFile;
+    QtLockedFile lockFile;
 
 private:
     static const char* ack;
Index: qtsingleapplication-2.6.1+git20180716/src/qtsingleapplication.pri
===================================================================
--- qtsingleapplication-2.6.1+git20180716.orig/src/qtsingleapplication.pri
+++ qtsingleapplication-2.6.1+git20180716/src/qtsingleapplication.pri
@@ -3,6 +3,7 @@ INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
 QT *= network
 greaterThan(QT_MAJOR_VERSION, 4): QT *= widgets
+CONFIG *= qtlockedfile
 
 qtsingleapplication-uselib:!qtsingleapplication-buildlib {
     LIBS += -L$$QTSINGLEAPPLICATION_LIBDIR -l$$QTSINGLEAPPLICATION_LIBNAME
Index: qtsingleapplication-2.6.1+git20180716/src/qtsinglecoreapplication.pri
===================================================================
--- qtsingleapplication-2.6.1+git20180716.orig/src/qtsinglecoreapplication.pri
+++ qtsingleapplication-2.6.1+git20180716/src/qtsinglecoreapplication.pri
@@ -4,6 +4,7 @@ DEPENDPATH += $$PWD
 QT *= network
 QT -= gui
 greaterThan(QT_MAJOR_VERSION, 4): QT -= widgets
+CONFIG *= qtlockedfile
 
 qtsinglecoreapplication-uselib:!qtsinglecoreapplication-buildlib {
     LIBS += -L$$QTSINGLECOREAPPLICATION_LIBDIR -l$$QTSINGLECOREAPPLICATION_LIBNAME

Places

File qtsingleapplication-remove-included-qtlockedfile.patch of Package qtsingleapplication

Places