diff --git a/src/lib/3rdparty/qtsingleapplication/qtsingleapplication.pri b/src/lib/3rdparty/qtsingleapplication/qtsingleapplication.pri index 4574effd4..28b51269a 100644 --- a/src/lib/3rdparty/qtsingleapplication/qtsingleapplication.pri +++ b/src/lib/3rdparty/qtsingleapplication/qtsingleapplication.pri @@ -1,13 +1,6 @@ -INCLUDEPATH += $$PWD DEPENDPATH += $$PWD -QT *= network - -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 $$PWD/qtlocalpeer.cpp +HEADERS += $$PWD/qtsingleapplication.h $$PWD/qtlocalpeer.h os2|win32 { contains(TEMPLATE, lib):contains(CONFIG, shared):DEFINES *= QT_QTSINGLEAPPLICATION_EXPORT diff --git a/src/lib/app/mainapplication.h b/src/lib/app/mainapplication.h index 3b6bbab7f..6c8fdfbea 100644 --- a/src/lib/app/mainapplication.h +++ b/src/lib/app/mainapplication.h @@ -22,7 +22,7 @@ #include -#include "qtsingleapplication.h" +#include "qtsingleapplication/qtsingleapplication.h" #include "restoremanager.h" #include "qzcommon.h" diff --git a/src/main/main.pro b/src/main/main.pro index 472fff491..6ecfaa2ea 100644 --- a/src/main/main.pro +++ b/src/main/main.pro @@ -16,7 +16,8 @@ TEMPLATE = app unix:!contains(DEFINES, "DISABLE_DBUS") QT += dbus -INCLUDEPATH += ../lib/app \ +INCLUDEPATH += ../lib/3rdparty \ + ../lib/app \ ../lib/session \ ../lib/webtab \ @@ -32,6 +33,5 @@ os2:RC_FILE = appicon_os2.rc win32:RC_FILE = appicon.rc include(../install.pri) -include(../lib/3rdparty/qtsingleapplication/qtsingleapplication.pri) unix:contains(DEFINES, "NO_SYSTEM_DATAPATH"): QMAKE_LFLAGS+=$${QMAKE_LFLAGS_RPATH}\\$\$ORIGIN