qtsingleapplication-build.diff

   1 diff -rupN qtsingleapplication-2.6_1-opensource.old/buildlib/buildcorelib.pro qtsingleapplication-2.6_1-opensource/buildlib/buildcorelib.pro
   2 --- qtsingleapplication-2.6_1-opensource.old/buildlib/buildcorelib.pro  1969-12-31 19:00:00.000000000 -0500
   3 +++ qtsingleapplication-2.6_1-opensource/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 qtsingleapplication-2.6_1-opensource.old/common.pri qtsingleapplication-2.6_1-opensource/common.pri
  19 --- qtsingleapplication-2.6_1-opensource.old/common.pri 2009-12-16 05:43:33.000000000 -0500
  20 +++ qtsingleapplication-2.6_1-opensource/common.pri     2010-07-21 22:09:10.000000000 -0400
  21 @@ -1,6 +1,6 @@
  22  infile(config.pri, SOLUTIONS_LIBRARY, yes): CONFIG += qtsingleapplication-uselib
  23  TEMPLATE += fakelib
  24  QTSINGLEAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleApplication-2.6)
  25 +QTSINGLECOREAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleCoreApplication-2.6)
  26  TEMPLATE -= fakelib
  27  QTSINGLEAPPLICATION_LIBDIR = $$PWD/lib
  28 -unix:qtsingleapplication-uselib:!qtsingleapplication-buildlib:QMAKE_RPATHDIR += $$QTSINGLEAPPLICATION_LIBDIR
  29 diff -rupN qtsingleapplication-2.6_1-opensource.old/qtsingleapplication.pro qtsingleapplication-2.6_1-opensource/qtsingleapplication.pro
  30 --- qtsingleapplication-2.6_1-opensource.old/qtsingleapplication.pro    2009-12-16 05:43:33.000000000 -0500
  31 +++ qtsingleapplication-2.6_1-opensource/qtsingleapplication.pro        2010-07-21 22:09:10.000000000 -0400
  32 @@ -1,5 +1,4 @@
  33  TEMPLATE=subdirs
  34  CONFIG += ordered
  35  include(common.pri)
  36 -qtsingleapplication-uselib:SUBDIRS=buildlib
  37 -SUBDIRS+=examples
  38 +qtsingleapplication-uselib:SUBDIRS=buildlib/buildlib.pro buildlib/buildcorelib.pro
  39 diff -rupN qtsingleapplication-2.6_1-opensource.old/src/QtSingleCoreApplication qtsingleapplication-2.6_1-opensource/src/QtSingleCoreApplication
  40 --- qtsingleapplication-2.6_1-opensource.old/src/QtSingleCoreApplication        1969-12-31 19:00:00.000000000 -0500
  41 +++ qtsingleapplication-2.6_1-opensource/src/QtSingleCoreApplication    2010-07-21 22:09:10.000000000 -0400
  42 @@ -0,0 +1 @@
  43 +#include "qtsinglecoreapplication.h"
  44 diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtsinglecoreapplication.pri qtsingleapplication-2.6_1-opensource/src/qtsinglecoreapplication.pri
  45 --- qtsingleapplication-2.6_1-opensource.old/src/qtsinglecoreapplication.pri    2009-12-16 05:43:33.000000000 -0500
  46 +++ qtsingleapplication-2.6_1-opensource/src/qtsinglecoreapplication.pri        2010-07-21 22:09:52.000000000 -0400
  47 @@ -1,10 +1,17 @@
  48 -INCLUDEPATH    += $$PWD
  49 -DEPENDPATH      += $$PWD
  50 -HEADERS                += $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h
  51 -SOURCES                += $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp
  52 -
  53 +include(../common.pri)
  54 +INCLUDEPATH += $$PWD
  55 +DEPENDPATH += $$PWD
  56  QT *= network
  57 +QT -= gui
  58
  59 -win32:contains(TEMPLATE, lib):contains(CONFIG, shared) {
  60 -    DEFINES += QT_QTSINGLECOREAPPLICATION_EXPORT=__declspec(dllexport)
  61 +qtsinglecoreapplication-uselib:!qtsinglecoreapplication-buildlib {
  62 +    LIBS += -L$$QTSINGLECOREAPPLICATION_LIBDIR -l$$QTSINGLECOREAPPLICATION_LIBNAME
  63 +} else {
  64 +    SOURCES += $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp
  65 +    HEADERS += $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h
  66  }
  67 +
  68 +win32 {
  69 +    contains(TEMPLATE, lib):contains(CONFIG, shared):DEFINES += QT_QTSINGLECOREAPPLICATION_EXPORT
  70 +    else:qtsinglecoreapplication-uselib:DEFINES += QT_QTSINGLECOREAPPLICATION_IMPORT
  71 +}
  72 \ No newline at end of file