qtsingleapplication-build.diff

   1 diff -rupN buildlib/buildcorelib.pro.old buildlib/buildcorelib.pro
   2 --- buildlib/buildcorelib.pro.old       1969-12-31 19:00:00.000000000 -0500
   3 +++ buildlib/buildcorelib.pro   2010-07-21 22:09:10.000000000 -0400
   4 @@ -0,0 +1,13 @@
   5 +TEMPLATE=lib
   6 +CONFIG += qt dll qtsinglecoreapplication-buildlib
   7 +mac:CONFIG += absolute_library_soname
   8 +win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all
   9 +include(../src/qtsinglecoreapplication.pri)
  10 +TARGET = $$QTSINGLECOREAPPLICATION_LIBNAME
  11 +DESTDIR = $$QTSINGLEAPPLICATION_LIBDIR
  12 +win32 {
  13 +    DLLDESTDIR = $$[QT_INSTALL_BINS]
  14 +    QMAKE_DISTCLEAN += $$[QT_INSTALL_BINS]\\$${QTSINGLECOREAPPLICATION_LIBNAME}.dll
  15 +}
  16 +target.path = $$DESTDIR
  17 +INSTALLS += target
  18 diff -rupN common.pri.old common.pri
  19 --- common.pri.old      2014-08-14 22:46:46.597411107 +0200
  20 +++ common.pri  2014-08-14 22:47:33.676859489 +0200
  21 @@ -1,6 +1,7 @@
  22  exists(config.pri):infile(config.pri, SOLUTIONS_LIBRARY, yes): CONFIG += qtsingleapplication-uselib
  23  TEMPLATE += fakelib
  24 -QTSINGLEAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleApplication-head)
  25 +QTSINGLEAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleApplication-2.6)
  26 +QTSINGLECOREAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleCoreApplication-2.6)
  27  TEMPLATE -= fakelib
  28  QTSINGLEAPPLICATION_LIBDIR = $$PWD/lib
  29 +QTSINGLECOREAPPLICATION_LIBDIR = $$PWD/lib
  30 -unix:qtsingleapplication-uselib:!qtsingleapplication-buildlib:QMAKE_RPATHDIR += $$QTSINGLEAPPLICATION_LIBDIR
  31 diff -rupN qtsingleapplication.pro.old qtsingleapplication.pro
  32 --- qtsingleapplication.pro.old 2009-12-16 05:43:33.000000000 -0500
  33 +++ qtsingleapplication.pro     2010-07-21 22:09:10.000000000 -0400
  34 @@ -1,5 +1,4 @@
  35  TEMPLATE=subdirs
  36  CONFIG += ordered
  37  include(common.pri)
  38 -qtsingleapplication-uselib:SUBDIRS=buildlib
  39 -SUBDIRS+=examples
  40 +qtsingleapplication-uselib:SUBDIRS=buildlib/buildlib.pro buildlib/buildcorelib.pro
  41 diff -rupN src/QtSingleCoreApplication.old src/QtSingleCoreApplication
  42 --- src/QtSingleCoreApplication.old     1969-12-31 19:00:00.000000000 -0500
  43 +++ src/QtSingleCoreApplication 2010-07-21 22:09:10.000000000 -0400
  44 @@ -0,0 +1 @@
  45 +#include "qtsinglecoreapplication.h"
  46 --- src/qtsinglecoreapplication.pri.old 2014-02-12 22:46:28.000000000 +0100
  47 +++ src/qtsinglecoreapplication.pri     2014-08-15 15:28:16.604289958 +0200
  48 @@ -1,10 +1,18 @@
  49 -INCLUDEPATH    += $$PWD
  50 -DEPENDPATH      += $$PWD
  51 -HEADERS                += $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h
  52 -SOURCES                += $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp
  53 +include(../common.pri)
  54 +INCLUDEPATH += $$PWD
  55 +DEPENDPATH += $$PWD
  56
  57  QT *= network
  58 +QT -= gui
  59
  60 -win32:contains(TEMPLATE, lib):contains(CONFIG, shared) {
  61 -    DEFINES += QT_QTSINGLECOREAPPLICATION_EXPORT=__declspec(dllexport)
  62 +qtsinglecoreapplication-uselib:!qtsinglecoreapplication-buildlib {
  63 +    LIBS += -L$$QTSINGLECOREAPPLICATION_LIBDIR -l$$QTSINGLECOREAPPLICATION_LIBNAME
  64 +} else {
  65 +    SOURCES += $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp
  66 +    HEADERS += $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h
  67 +}
  68 +
  69 +win32 {
  70 +    contains(TEMPLATE, lib):contains(CONFIG, shared):DEFINES += QT_QTSINGLECOREAPPLICATION_EXPORT
  71 +    else:qtsinglecoreapplication-uselib:DEFINES += QT_QTSINGLECOREAPPLICATION_IMPORT
  72  }