Add dev-qt from an older version of the gentoo repo
Qt5 has been removed, we restore it since we still use it.
This commit is contained in:
@ -0,0 +1,67 @@
|
||||
From f66352d6c2918123466bd72aee2118b9167562af Mon Sep 17 00:00:00 2001
|
||||
From: Davide Pesavento <davidepesa@gmail.com>
|
||||
Date: Sat, 28 Dec 2013 16:43:18 +0100
|
||||
Subject: [PATCH] no gui
|
||||
|
||||
---
|
||||
buildlib/buildlib.pro | 4 +++-
|
||||
src/qtsingleapplication.pri | 11 +++++------
|
||||
src/qtsinglecoreapplication.pri | 2 +-
|
||||
3 files changed, 9 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/buildlib/buildlib.pro b/buildlib/buildlib.pro
|
||||
index 37dddcd..f7c6508 100644
|
||||
--- a/buildlib/buildlib.pro
|
||||
+++ b/buildlib/buildlib.pro
|
||||
@@ -2,7 +2,9 @@ TEMPLATE=lib
|
||||
CONFIG += qt dll qtsingleapplication-buildlib
|
||||
mac:CONFIG += absolute_library_soname
|
||||
win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all
|
||||
-include(../src/qtsingleapplication.pri)
|
||||
+include(../common.pri)
|
||||
+include(../src/qtsinglecoreapplication.pri)
|
||||
+exists(../config.pri):!infile(../config.pri, QTSA_NO_GUI, yes):include(../src/qtsingleapplication.pri)
|
||||
TARGET = $$QTSINGLEAPPLICATION_LIBNAME
|
||||
DESTDIR = $$QTSINGLEAPPLICATION_LIBDIR
|
||||
win32 {
|
||||
diff --git a/src/qtsingleapplication.pri b/src/qtsingleapplication.pri
|
||||
index 02c9e5b..772924d 100644
|
||||
--- a/src/qtsingleapplication.pri
|
||||
+++ b/src/qtsingleapplication.pri
|
||||
@@ -1,15 +1,14 @@
|
||||
-include(../common.pri)
|
||||
-INCLUDEPATH += $$PWD
|
||||
-DEPENDPATH += $$PWD
|
||||
-QT *= network
|
||||
+INCLUDEPATH *= $$PWD
|
||||
+DEPENDPATH *= $$PWD
|
||||
+QT *= gui network
|
||||
greaterThan(QT_MAJOR_VERSION, 4): QT *= widgets
|
||||
CONFIG *= qtlockedfile
|
||||
|
||||
qtsingleapplication-uselib:!qtsingleapplication-buildlib {
|
||||
LIBS += -L$$QTSINGLEAPPLICATION_LIBDIR -l$$QTSINGLEAPPLICATION_LIBNAME
|
||||
} else {
|
||||
- SOURCES += $$PWD/qtsingleapplication.cpp $$PWD/qtlocalpeer.cpp
|
||||
- HEADERS += $$PWD/qtsingleapplication.h $$PWD/qtlocalpeer.h
|
||||
+ SOURCES += $$PWD/qtsingleapplication.cpp
|
||||
+ HEADERS += $$PWD/qtsingleapplication.h
|
||||
}
|
||||
|
||||
win32 {
|
||||
diff --git a/src/qtsinglecoreapplication.pri b/src/qtsinglecoreapplication.pri
|
||||
index f5b8414..bf14a3f 100644
|
||||
--- a/src/qtsinglecoreapplication.pri
|
||||
+++ b/src/qtsinglecoreapplication.pri
|
||||
@@ -3,7 +3,7 @@ DEPENDPATH += $$PWD
|
||||
HEADERS += $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h
|
||||
SOURCES += $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp
|
||||
|
||||
-QT *= network
|
||||
+QT = core network
|
||||
CONFIG *= qtlockedfile
|
||||
|
||||
win32:contains(TEMPLATE, lib):contains(CONFIG, shared) {
|
||||
--
|
||||
1.8.5.2
|
||||
|
||||
@ -0,0 +1,81 @@
|
||||
From 62210d463f87abb0584ce699915e1845cacaa480 Mon Sep 17 00:00:00 2001
|
||||
From: Davide Pesavento <davidepesa@gmail.com>
|
||||
Date: Sat, 28 Dec 2013 16:33:15 +0100
|
||||
Subject: [PATCH] unbundle qtlockedfile
|
||||
|
||||
---
|
||||
src/qtlocalpeer.cpp | 11 +----------
|
||||
src/qtlocalpeer.h | 2 +-
|
||||
src/qtsingleapplication.pri | 1 +
|
||||
src/qtsinglecoreapplication.pri | 1 +
|
||||
4 files changed, 4 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/src/qtlocalpeer.cpp b/src/qtlocalpeer.cpp
|
||||
index 332b064..f17e662 100644
|
||||
--- a/src/qtlocalpeer.cpp
|
||||
+++ b/src/qtlocalpeer.cpp
|
||||
@@ -55,15 +55,6 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0;
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
-namespace QtLP_Private {
|
||||
-#include "qtlockedfile.cpp"
|
||||
-#if defined(Q_OS_WIN)
|
||||
-#include "qtlockedfile_win.cpp"
|
||||
-#else
|
||||
-#include "qtlockedfile_unix.cpp"
|
||||
-#endif
|
||||
-}
|
||||
-
|
||||
const char* QtLocalPeer::ack = "ack";
|
||||
|
||||
QtLocalPeer::QtLocalPeer(QObject* parent, const QString &appId)
|
||||
@@ -114,7 +105,7 @@ bool QtLocalPeer::isClient()
|
||||
if (lockFile.isLocked())
|
||||
return false;
|
||||
|
||||
- if (!lockFile.lock(QtLP_Private::QtLockedFile::WriteLock, false))
|
||||
+ if (!lockFile.lock(QtLockedFile::WriteLock, false))
|
||||
return true;
|
||||
|
||||
bool res = server->listen(socketName);
|
||||
diff --git a/src/qtlocalpeer.h b/src/qtlocalpeer.h
|
||||
index 1b533b1..1127735 100644
|
||||
--- a/src/qtlocalpeer.h
|
||||
+++ b/src/qtlocalpeer.h
|
||||
@@ -68,7 +68,7 @@ protected:
|
||||
QString id;
|
||||
QString socketName;
|
||||
QLocalServer* server;
|
||||
- QtLP_Private::QtLockedFile lockFile;
|
||||
+ QtLockedFile lockFile;
|
||||
|
||||
private:
|
||||
static const char* ack;
|
||||
diff --git a/src/qtsingleapplication.pri b/src/qtsingleapplication.pri
|
||||
index 6f2bced..02c9e5b 100644
|
||||
--- a/src/qtsingleapplication.pri
|
||||
+++ b/src/qtsingleapplication.pri
|
||||
@@ -3,6 +3,7 @@ INCLUDEPATH += $$PWD
|
||||
DEPENDPATH += $$PWD
|
||||
QT *= network
|
||||
greaterThan(QT_MAJOR_VERSION, 4): QT *= widgets
|
||||
+CONFIG *= qtlockedfile
|
||||
|
||||
qtsingleapplication-uselib:!qtsingleapplication-buildlib {
|
||||
LIBS += -L$$QTSINGLEAPPLICATION_LIBDIR -l$$QTSINGLEAPPLICATION_LIBNAME
|
||||
diff --git a/src/qtsinglecoreapplication.pri b/src/qtsinglecoreapplication.pri
|
||||
index d2d6cc3..f5b8414 100644
|
||||
--- a/src/qtsinglecoreapplication.pri
|
||||
+++ b/src/qtsinglecoreapplication.pri
|
||||
@@ -4,6 +4,7 @@ HEADERS += $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h
|
||||
SOURCES += $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp
|
||||
|
||||
QT *= network
|
||||
+CONFIG *= qtlockedfile
|
||||
|
||||
win32:contains(TEMPLATE, lib):contains(CONFIG, shared) {
|
||||
DEFINES += QT_QTSINGLECOREAPPLICATION_EXPORT=__declspec(dllexport)
|
||||
--
|
||||
1.8.5.2
|
||||
|
||||
9
dev-qt/qtsingleapplication/files/qtsingleapplication.prf
Normal file
9
dev-qt/qtsingleapplication/files/qtsingleapplication.prf
Normal file
@ -0,0 +1,9 @@
|
||||
INCLUDEPATH *= $$[QT_INSTALL_HEADERS]/QtSolutions
|
||||
greaterThan(QT_MAJOR_VERSION, 4) {
|
||||
LIBS *= -lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication-2.6
|
||||
QT *= widgets
|
||||
} else {
|
||||
LIBS *= -lQtSolutions_SingleApplication-2.6
|
||||
}
|
||||
QT *= network
|
||||
CONFIG *= qtlockedfile
|
||||
@ -0,0 +1,8 @@
|
||||
INCLUDEPATH *= $$[QT_INSTALL_HEADERS]/QtSolutions
|
||||
greaterThan(QT_MAJOR_VERSION, 4) {
|
||||
LIBS *= -lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication-2.6
|
||||
} else {
|
||||
LIBS *= -lQtSolutions_SingleApplication-2.6
|
||||
}
|
||||
QT *= network
|
||||
CONFIG *= qtlockedfile
|
||||
Reference in New Issue
Block a user