Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

[Windows] Correctly fix building after 6473bace10

Browse Source
This commit is contained in:
nowrep 2014-04-07 08:25:07 +02:00
parent 6473bace10
commit 7824f3862e
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib/3rdparty/qtsingleapplication/qtsingleapplication.pri vendored
View File

@ -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

2
src/lib/app/mainapplication.h
View File

@ -22,7 +22,7 @@
#include <QList>
#include "qtsingleapplication.h"
#include "qtsingleapplication/qtsingleapplication.h"
#include "restoremanager.h"
#include "qzcommon.h"

4
src/main/main.pro
View File

@ -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