- update patches from fc, SingleCoreApplication built now as well

[packages/QtSingleApplication.git] / qtsingleapplication-build.diff

diff -rupN qtsingleapplication-2.6_1-opensource.old/buildlib/buildcorelib.pro qtsingleapplication-2.6_1-opensource/buildlib/buildcorelib.pro
--- qtsingleapplication-2.6_1-opensource.old/buildlib/buildcorelib.pro	1969-12-31 19:00:00.000000000 -0500
+++ qtsingleapplication-2.6_1-opensource/buildlib/buildcorelib.pro	2010-07-21 22:09:10.000000000 -0400
@@ -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_1-opensource.old/common.pri qtsingleapplication-2.6_1-opensource/common.pri
--- qtsingleapplication-2.6_1-opensource.old/common.pri	2009-12-16 05:43:33.000000000 -0500
+++ qtsingleapplication-2.6_1-opensource/common.pri	2010-07-21 22:09:10.000000000 -0400
@@ -1,6 +1,6 @@
 infile(config.pri, SOLUTIONS_LIBRARY, yes): CONFIG += qtsingleapplication-uselib
 TEMPLATE += fakelib
 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_1-opensource.old/qtsingleapplication.pro qtsingleapplication-2.6_1-opensource/qtsingleapplication.pro
--- qtsingleapplication-2.6_1-opensource.old/qtsingleapplication.pro	2009-12-16 05:43:33.000000000 -0500
+++ qtsingleapplication-2.6_1-opensource/qtsingleapplication.pro	2010-07-21 22:09:10.000000000 -0400
@@ -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_1-opensource.old/src/QtSingleCoreApplication qtsingleapplication-2.6_1-opensource/src/QtSingleCoreApplication
--- qtsingleapplication-2.6_1-opensource.old/src/QtSingleCoreApplication	1969-12-31 19:00:00.000000000 -0500
+++ qtsingleapplication-2.6_1-opensource/src/QtSingleCoreApplication	2010-07-21 22:09:10.000000000 -0400
@@ -0,0 +1 @@
+#include "qtsinglecoreapplication.h"
diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtsinglecoreapplication.pri qtsingleapplication-2.6_1-opensource/src/qtsinglecoreapplication.pri
--- qtsingleapplication-2.6_1-opensource.old/src/qtsinglecoreapplication.pri	2009-12-16 05:43:33.000000000 -0500
+++ qtsingleapplication-2.6_1-opensource/src/qtsinglecoreapplication.pri	2010-07-21 22:09:52.000000000 -0400
@@ -1,10 +1,17 @@
-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
 
-win32:contains(TEMPLATE, lib):contains(CONFIG, shared) {
-    DEFINES += QT_QTSINGLECOREAPPLICATION_EXPORT=__declspec(dllexport)
+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
+    else:qtsinglecoreapplication-uselib:DEFINES += QT_QTSINGLECOREAPPLICATION_IMPORT
+}
\ No newline at end of file