File qtsingleapplication-build_inst_lib.patch of Package qtsingleapplication

Overview Repositories Revisions Requests Users Attributes Meta

File qtsingleapplication-build_inst_lib.patch of Package qtsingleapplication

Index: qtsingleapplication-2.6.1+git20180716/buildlib/buildcorelib.pro
===================================================================
--- /dev/null
+++ qtsingleapplication-2.6.1+git20180716/buildlib/buildcorelib.pro
@@ -0,0 +1,15 @@
+TEMPLATE=lib
+CONFIG += qt dll qtsinglecoreapplication-buildlib
+mac:CONFIG += absolute_library_soname
+win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all
+include(../src/qtsinglecoreapplication.pri)
+TARGET = $$QTSINGLECOREAPPLICATION_LIBNAME
+DESTDIR = $$QTSINGLEAPPLICATION_LIBDIR
+win32 {
+    DLLDESTDIR = $$[QT_INSTALL_BINS]
+    QMAKE_DISTCLEAN += $$[QT_INSTALL_BINS]\\$${QTSINGLECOREAPPLICATION_LIBNAME}.dll
+}
+headers.files = ../src/qtsinglecoreapplication.h ../src/QtSingleCoreApplication
+headers.path = $$[QT_INSTALL_HEADERS]/QtSolutions
+target.path = $$[QT_INSTALL_LIBS]
+INSTALLS += target headers
Index: qtsingleapplication-2.6.1+git20180716/common.pri
===================================================================
--- qtsingleapplication-2.6.1+git20180716.orig/common.pri
+++ qtsingleapplication-2.6.1+git20180716/common.pri
@@ -4,11 +4,11 @@ TEMPLATE += fakelib
 greaterThan(QT_MAJOR_VERSION, 5)|\
   if(equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 4))|\
   if(equals(QT_MAJOR_VERSION, 5):equals(QT_MINOR_VERSION, 4):greaterThan(QT_PATCH_VERSION, 1)) {
-    QTSINGLEAPPLICATION_LIBNAME = $$qt5LibraryTarget(QtSolutions_SingleApplication-head)
+  QTSINGLEAPPLICATION_LIBNAME = $$qtLibraryTarget(Qt5Solutions_SingleApplication-__LIBVER__)
+  QTSINGLECOREAPPLICATION_LIBNAME = $$qtLibraryTarget(Qt5Solutions_SingleCoreApplication-__LIBVER__)
 } else {
     QTSINGLEAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleApplication-head)
 }
 TEMPLATE -= fakelib
 
 QTSINGLEAPPLICATION_LIBDIR = $$PWD/lib
-unix:qtsingleapplication-uselib:!qtsingleapplication-buildlib:QMAKE_RPATHDIR += $$QTSINGLEAPPLICATION_LIBDIR
Index: qtsingleapplication-2.6.1+git20180716/qtsingleapplication.pro
===================================================================
--- qtsingleapplication-2.6.1+git20180716.orig/qtsingleapplication.pro
+++ qtsingleapplication-2.6.1+git20180716/qtsingleapplication.pro
@@ -1,5 +1,4 @@
 TEMPLATE=subdirs
 CONFIG += ordered
 include(common.pri)
-qtsingleapplication-uselib:SUBDIRS=buildlib
-SUBDIRS+=examples
+SUBDIRS=buildlib/buildlib.pro buildlib/buildcorelib.pro
Index: qtsingleapplication-2.6.1+git20180716/src/QtSingleCoreApplication
===================================================================
--- /dev/null
+++ qtsingleapplication-2.6.1+git20180716/src/QtSingleCoreApplication
@@ -0,0 +1 @@
+#include "qtsinglecoreapplication.h"
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
@@ -1,10 +1,18 @@
-INCLUDEPATH	+= $$PWD
-DEPENDPATH      += $$PWD
-HEADERS		+= $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h
-SOURCES		+= $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp
-
+include(../common.pri)
+INCLUDEPATH += $$PWD
+DEPENDPATH += $$PWD
 QT *= network
+QT -= gui
+greaterThan(QT_MAJOR_VERSION, 4): QT -= widgets
+
+qtsinglecoreapplication-uselib:!qtsinglecoreapplication-buildlib {
+    LIBS += -L$$QTSINGLECOREAPPLICATION_LIBDIR -l$$QTSINGLECOREAPPLICATION_LIBNAME
+} else {
+    SOURCES += $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp
+    HEADERS += $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h
+}
 
-win32:contains(TEMPLATE, lib):contains(CONFIG, shared) {
-    DEFINES += QT_QTSINGLECOREAPPLICATION_EXPORT=__declspec(dllexport)
+win32 {
+    contains(TEMPLATE, lib):contains(CONFIG, shared):DEFINES += QT_QTSINGLECOREAPPLICATION_EXPORT
+    else:qtsinglecoreapplication-uselib:DEFINES += QT_QTSINGLECOREAPPLICATION_IMPORT
 }
Index: qtsingleapplication-2.6.1+git20180716/buildlib/buildlib.pro
===================================================================
--- qtsingleapplication-2.6.1+git20180716.orig/buildlib/buildlib.pro
+++ qtsingleapplication-2.6.1+git20180716/buildlib/buildlib.pro
@@ -9,5 +9,7 @@ win32 {
     DLLDESTDIR = $$[QT_INSTALL_BINS]
     QMAKE_DISTCLEAN += $$[QT_INSTALL_BINS]\\$${QTSINGLEAPPLICATION_LIBNAME}.dll
 }
-target.path = $$DESTDIR
-INSTALLS += target
+headers.files = ../src/qtsingleapplication.h ../src/QtSingleApplication
+headers.path = $$[QT_INSTALL_HEADERS]/QtSolutions
+target.path = $$[QT_INSTALL_LIBS]
+INSTALLS += target headers

Places

File qtsingleapplication-build_inst_lib.patch of Package qtsingleapplication

Places