- pl

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

diff --git a/qtsingleapplication-build.diff b/qtsingleapplication-build.diff
index 8f760d33d6dd10f98ab79269f4b119806e2c6103..36365b8dae7bf7f873f6640e2204cd2abe295416 100644 (file)
--- a/qtsingleapplication-build.diff
+++ b/qtsingleapplication-build.diff
@@ -1,6 +1,6 @@
-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
+diff -rupN buildlib/buildcorelib.pro.old buildlib/buildcorelib.pro
+--- buildlib/buildcorelib.pro.old      1969-12-31 19:00:00.000000000 -0500
++++ buildlib/buildcorelib.pro  2010-07-21 22:09:10.000000000 -0400
 @@ -0,0 +1,13 @@
 +TEMPLATE=lib
 +CONFIG += qt dll qtsinglecoreapplication-buildlib
@@ -15,20 +15,26 @@ diff -rupN qtsingleapplication-2.6_1-opensource.old/buildlib/buildcorelib.pro qt
 +}
 +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)
+diff -rupN common.pri.old common.pri
+--- common.pri.old     2015-09-13 18:29:19.955577604 +0200
++++ common.pri 2015-09-13 18:32:21.054587906 +0200
+@@ -5,10 +5,12 @@ greaterThan(QT_MAJOR_VERSION, 5)|\
+   if(equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 4))|\
+   if(equals(QT_MAJOR_VERSION, 5):equals(QT_MINOR_VERSION, 4):greaterThan(QT_PATCH_VERSION, 1)) {
+     QTSINGLEAPPLICATION_LIBNAME = $$qt5LibraryTarget(QtSolutions_SingleApplication-head)
++    QTSINGLECOREAPPLICATION_LIBNAME = $$qt5LibraryTarget(QtSolutions_SingleCoreApplication-head)
+ } else {
+     QTSINGLEAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleApplication-head)
++    QTSINGLECOREAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleCoreApplication-head)
+ }
  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
++QTSINGLECOREAPPLICATION_LIBDIR = $$PWD/lib
+diff -rupN qtsingleapplication.pro.old qtsingleapplication.pro
+--- qtsingleapplication.pro.old        2009-12-16 05:43:33.000000000 -0500
++++ qtsingleapplication.pro    2010-07-21 22:09:10.000000000 -0400
 @@ -1,5 +1,4 @@
  TEMPLATE=subdirs
  CONFIG += ordered
@@ -36,23 +42,22 @@ diff -rupN qtsingleapplication-2.6_1-opensource.old/qtsingleapplication.pro qtsi
 -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
+diff -rupN src/QtSingleCoreApplication.old src/QtSingleCoreApplication
+--- src/QtSingleCoreApplication.old    1969-12-31 19:00:00.000000000 -0500
++++ 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 @@
+--- src/qtsinglecoreapplication.pri.old        2014-02-12 22:46:28.000000000 +0100
++++ src/qtsinglecoreapplication.pri    2014-08-15 15:28:16.604289958 +0200
+@@ -1,10 +1,18 @@
 -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
  
@@ -63,10 +68,9 @@ diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtsinglecoreapplication.
 +} 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
+ }