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      2015-09-13 18:29:19.955577604 +0200
  20 +++ common.pri  2015-09-13 18:32:21.054587906 +0200
  21 @@ -5,10 +5,12 @@ greaterThan(QT_MAJOR_VERSION, 5)|\
  22    if(equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 4))|\
  23    if(equals(QT_MAJOR_VERSION, 5):equals(QT_MINOR_VERSION, 4):greaterThan(QT_PATCH_VERSION, 1)) {
  24      QTSINGLEAPPLICATION_LIBNAME = $$qt5LibraryTarget(QtSolutions_SingleApplication-head)
  25 +    QTSINGLECOREAPPLICATION_LIBNAME = $$qt5LibraryTarget(QtSolutions_SingleCoreApplication-head)
  26  } else {
  27      QTSINGLEAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleApplication-head)
  28 +    QTSINGLECOREAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleCoreApplication-head)
  29  }
  30  TEMPLATE -= fakelib
  31
  32  QTSINGLEAPPLICATION_LIBDIR = $$PWD/lib
  33 -unix:qtsingleapplication-uselib:!qtsingleapplication-buildlib:QMAKE_RPATHDIR += $$QTSINGLEAPPLICATION_LIBDIR
  34 +QTSINGLECOREAPPLICATION_LIBDIR = $$PWD/lib
  35 diff -rupN qtsingleapplication.pro.old qtsingleapplication.pro
  36 --- qtsingleapplication.pro.old 2009-12-16 05:43:33.000000000 -0500
  37 +++ qtsingleapplication.pro     2010-07-21 22:09:10.000000000 -0400
  38 @@ -1,5 +1,4 @@
  39  TEMPLATE=subdirs
  40  CONFIG += ordered
  41  include(common.pri)
  42 -qtsingleapplication-uselib:SUBDIRS=buildlib
  43 -SUBDIRS+=examples
  44 +qtsingleapplication-uselib:SUBDIRS=buildlib/buildlib.pro buildlib/buildcorelib.pro
  45 diff -rupN src/QtSingleCoreApplication.old src/QtSingleCoreApplication
  46 --- src/QtSingleCoreApplication.old     1969-12-31 19:00:00.000000000 -0500
  47 +++ src/QtSingleCoreApplication 2010-07-21 22:09:10.000000000 -0400
  48 @@ -0,0 +1 @@
  49 +#include "qtsinglecoreapplication.h"
  50 --- src/qtsinglecoreapplication.pri.old 2014-02-12 22:46:28.000000000 +0100
  51 +++ src/qtsinglecoreapplication.pri     2014-08-15 15:28:16.604289958 +0200
  52 @@ -1,10 +1,18 @@
  53 -INCLUDEPATH    += $$PWD
  54 -DEPENDPATH      += $$PWD
  55 -HEADERS                += $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h
  56 -SOURCES                += $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp
  57 +include(../common.pri)
  58 +INCLUDEPATH += $$PWD
  59 +DEPENDPATH += $$PWD
  60
  61  QT *= network
  62 +QT -= gui
  63
  64 -win32:contains(TEMPLATE, lib):contains(CONFIG, shared) {
  65 -    DEFINES += QT_QTSINGLECOREAPPLICATION_EXPORT=__declspec(dllexport)
  66 +qtsinglecoreapplication-uselib:!qtsinglecoreapplication-buildlib {
  67 +    LIBS += -L$$QTSINGLECOREAPPLICATION_LIBDIR -l$$QTSINGLECOREAPPLICATION_LIBNAME
  68 +} else {
  69 +    SOURCES += $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp
  70 +    HEADERS += $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h
  71 +}
  72 +
  73 +win32 {
  74 +    contains(TEMPLATE, lib):contains(CONFIG, shared):DEFINES += QT_QTSINGLECOREAPPLICATION_EXPORT
  75 +    else:qtsinglecoreapplication-uselib:DEFINES += QT_QTSINGLECOREAPPLICATION_IMPORT
  76  }