|
Fabio Alessandro Locati |
6976dfe |
diff -rupN buildlib/buildcorelib.pro.old buildlib/buildcorelib.pro
|
|
Fabio Alessandro Locati |
6976dfe |
--- buildlib/buildcorelib.pro.old 1969-12-31 19:00:00.000000000 -0500
|
|
Fabio Alessandro Locati |
6976dfe |
+++ buildlib/buildcorelib.pro 2010-07-21 22:09:10.000000000 -0400
|
|
 |
a41d467 |
@@ -0,0 +1,13 @@
|
|
|
a41d467 |
+TEMPLATE=lib
|
|
|
a41d467 |
+CONFIG += qt dll qtsinglecoreapplication-buildlib
|
|
|
a41d467 |
+mac:CONFIG += absolute_library_soname
|
|
|
a41d467 |
+win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all
|
|
|
a41d467 |
+include(../src/qtsinglecoreapplication.pri)
|
|
|
a41d467 |
+TARGET = $$QTSINGLECOREAPPLICATION_LIBNAME
|
|
|
a41d467 |
+DESTDIR = $$QTSINGLEAPPLICATION_LIBDIR
|
|
|
a41d467 |
+win32 {
|
|
|
a41d467 |
+ DLLDESTDIR = $$[QT_INSTALL_BINS]
|
|
|
a41d467 |
+ QMAKE_DISTCLEAN += $$[QT_INSTALL_BINS]\\$${QTSINGLECOREAPPLICATION_LIBNAME}.dll
|
|
|
a41d467 |
+}
|
|
|
a41d467 |
+target.path = $$DESTDIR
|
|
|
a41d467 |
+INSTALLS += target
|
|
Fabio Alessandro Locati |
6976dfe |
diff -rupN common.pri.old common.pri
|
|
 |
bbb4b02 |
--- common.pri.old 2015-09-13 18:29:19.955577604 +0200
|
|
|
bbb4b02 |
+++ common.pri 2015-09-13 18:32:21.054587906 +0200
|
|
|
bbb4b02 |
@@ -5,10 +5,12 @@ greaterThan(QT_MAJOR_VERSION, 5)|\
|
|
|
bbb4b02 |
if(equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 4))|\
|
|
|
bbb4b02 |
if(equals(QT_MAJOR_VERSION, 5):equals(QT_MINOR_VERSION, 4):greaterThan(QT_PATCH_VERSION, 1)) {
|
|
|
bbb4b02 |
QTSINGLEAPPLICATION_LIBNAME = $$qt5LibraryTarget(QtSolutions_SingleApplication-head)
|
|
|
bbb4b02 |
+ QTSINGLECOREAPPLICATION_LIBNAME = $$qt5LibraryTarget(QtSolutions_SingleCoreApplication-head)
|
|
|
bbb4b02 |
} else {
|
|
|
bbb4b02 |
QTSINGLEAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleApplication-head)
|
|
|
bbb4b02 |
+ QTSINGLECOREAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleCoreApplication-head)
|
|
|
bbb4b02 |
}
|
|
|
a41d467 |
TEMPLATE -= fakelib
|
|
|
bbb4b02 |
|
|
|
a41d467 |
QTSINGLEAPPLICATION_LIBDIR = $$PWD/lib
|
|
|
a41d467 |
-unix:qtsingleapplication-uselib:!qtsingleapplication-buildlib:QMAKE_RPATHDIR += $$QTSINGLEAPPLICATION_LIBDIR
|
|
|
bbb4b02 |
+QTSINGLECOREAPPLICATION_LIBDIR = $$PWD/lib
|
|
Fabio Alessandro Locati |
6976dfe |
diff -rupN qtsingleapplication.pro.old qtsingleapplication.pro
|
|
Fabio Alessandro Locati |
6976dfe |
--- qtsingleapplication.pro.old 2009-12-16 05:43:33.000000000 -0500
|
|
Fabio Alessandro Locati |
6976dfe |
+++ qtsingleapplication.pro 2010-07-21 22:09:10.000000000 -0400
|
|
|
a41d467 |
@@ -1,5 +1,4 @@
|
|
|
a41d467 |
TEMPLATE=subdirs
|
|
|
615190f |
CONFIG += ordered
|
|
|
615190f |
include(common.pri)
|
|
|
a41d467 |
-qtsingleapplication-uselib:SUBDIRS=buildlib
|
|
|
615190f |
-SUBDIRS+=examples
|
|
|
a41d467 |
+qtsingleapplication-uselib:SUBDIRS=buildlib/buildlib.pro buildlib/buildcorelib.pro
|
|
Fabio Alessandro Locati |
6976dfe |
diff -rupN src/QtSingleCoreApplication.old src/QtSingleCoreApplication
|
|
Fabio Alessandro Locati |
6976dfe |
--- src/QtSingleCoreApplication.old 1969-12-31 19:00:00.000000000 -0500
|
|
Fabio Alessandro Locati |
6976dfe |
+++ src/QtSingleCoreApplication 2010-07-21 22:09:10.000000000 -0400
|
|
|
615190f |
@@ -0,0 +1 @@
|
|
|
615190f |
+#include "qtsinglecoreapplication.h"
|
|
Fabio Alessandro Locati |
6976dfe |
--- src/qtsinglecoreapplication.pri.old 2014-02-12 22:46:28.000000000 +0100
|
|
Fabio Alessandro Locati |
6976dfe |
+++ src/qtsinglecoreapplication.pri 2014-08-15 15:28:16.604289958 +0200
|
|
Fabio Alessandro Locati |
6976dfe |
@@ -1,10 +1,18 @@
|
|
|
a41d467 |
-INCLUDEPATH += $$PWD
|
|
|
a41d467 |
-DEPENDPATH += $$PWD
|
|
|
a41d467 |
-HEADERS += $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h
|
|
|
a41d467 |
-SOURCES += $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp
|
|
|
a41d467 |
+include(../common.pri)
|
|
|
a41d467 |
+INCLUDEPATH += $$PWD
|
|
|
a41d467 |
+DEPENDPATH += $$PWD
|
|
Fabio Alessandro Locati |
6976dfe |
|
|
|
a41d467 |
QT *= network
|
|
|
a41d467 |
+QT -= gui
|
|
|
a41d467 |
|
|
|
a41d467 |
-win32:contains(TEMPLATE, lib):contains(CONFIG, shared) {
|
|
|
a41d467 |
- DEFINES += QT_QTSINGLECOREAPPLICATION_EXPORT=__declspec(dllexport)
|
|
|
a41d467 |
+qtsinglecoreapplication-uselib:!qtsinglecoreapplication-buildlib {
|
|
|
a41d467 |
+ LIBS += -L$$QTSINGLECOREAPPLICATION_LIBDIR -l$$QTSINGLECOREAPPLICATION_LIBNAME
|
|
|
a41d467 |
+} else {
|
|
|
a41d467 |
+ SOURCES += $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp
|
|
|
a41d467 |
+ HEADERS += $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h
|
|
Fabio Alessandro Locati |
6976dfe |
+}
|
|
|
a41d467 |
+
|
|
|
a41d467 |
+win32 {
|
|
|
a41d467 |
+ contains(TEMPLATE, lib):contains(CONFIG, shared):DEFINES += QT_QTSINGLECOREAPPLICATION_EXPORT
|
|
|
a41d467 |
+ else:qtsinglecoreapplication-uselib:DEFINES += QT_QTSINGLECOREAPPLICATION_IMPORT
|
|
Fabio Alessandro Locati |
6976dfe |
}
|