File qtsingleapplication-build.diff of Package qtsingleapplication

Overview Repositories Revisions Requests Users Attributes Meta

File qtsingleapplication-build.diff of Package qtsingleapplication

diff -rupN qtsingleapplication-2.6_1git.orig/buildlib/buildcorelib.pro qtsingleapplication-2.6_1git/buildlib/buildcorelib.pro
--- qtsingleapplication-2.6_1git.orig/buildlib/buildcorelib.pro	1970-01-01 01:00:00.000000000 +0100
+++ qtsingleapplication-2.6_1git/buildlib/buildcorelib.pro	2013-05-10 11:08:07.050399734 +0200
@@ -0,0 +1,13 @@
+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
+}
+target.path = $$DESTDIR
+INSTALLS += target
diff -rupN qtsingleapplication-2.6_1git.orig/common.pri qtsingleapplication-2.6_1git/common.pri
--- qtsingleapplication-2.6_1git.orig/common.pri	2013-05-10 00:36:26.000000000 +0200
+++ qtsingleapplication-2.6_1git/common.pri	2013-05-10 11:17:20.565744754 +0200
@@ -1,6 +1,6 @@
 exists(config.pri):infile(config.pri, SOLUTIONS_LIBRARY, yes): CONFIG += qtsingleapplication-uselib
 TEMPLATE += fakelib
-QTSINGLEAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleApplication-head)
+QTSINGLEAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleApplication-2.6)
+QTSINGLECOREAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleCoreApplication-2.6)
 TEMPLATE -= fakelib
 QTSINGLEAPPLICATION_LIBDIR = $$PWD/lib
-unix:qtsingleapplication-uselib:!qtsingleapplication-buildlib:QMAKE_RPATHDIR += $$QTSINGLEAPPLICATION_LIBDIR
diff -rupN qtsingleapplication-2.6_1git.orig/qtsingleapplication.pro qtsingleapplication-2.6_1git/qtsingleapplication.pro
--- qtsingleapplication-2.6_1git.orig/qtsingleapplication.pro	2013-05-10 00:36:26.000000000 +0200
+++ qtsingleapplication-2.6_1git/qtsingleapplication.pro	2013-05-10 11:19:40.672993172 +0200
@@ -1,5 +1,4 @@
 TEMPLATE=subdirs
 CONFIG += ordered
 include(common.pri)
-qtsingleapplication-uselib:SUBDIRS=buildlib
-SUBDIRS+=examples
+qtsingleapplication-uselib:SUBDIRS=buildlib/buildlib.pro buildlib/buildcorelib.pro
diff -rupN qtsingleapplication-2.6_1git.orig/src/QtSingleCoreApplication qtsingleapplication-2.6_1git/src/QtSingleCoreApplication
--- qtsingleapplication-2.6_1git.orig/src/QtSingleCoreApplication	1970-01-01 01:00:00.000000000 +0100
+++ qtsingleapplication-2.6_1git/src/QtSingleCoreApplication	2013-05-10 11:21:43.961451855 +0200
@@ -0,0 +1 @@
+#include "qtsinglecoreapplication.h"
diff -rupN qtsingleapplication-2.6_1git.orig/src/qtsinglecoreapplication.pri qtsingleapplication-2.6_1git/src/qtsinglecoreapplication.pri
--- qtsingleapplication-2.6_1git.orig/src/qtsinglecoreapplication.pri	2013-05-10 00:36:26.000000000 +0200
+++ qtsingleapplication-2.6_1git/src/qtsinglecoreapplication.pri	2013-05-10 11:49:30.799613508 +0200
@@ -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
 }

Places

File qtsingleapplication-build.diff of Package qtsingleapplication

Places