From f66352d6c2918123466bd72aee2118b9167562af Mon Sep 17 00:00:00 2001 From: Davide Pesavento 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