From c9cfd8fb6f0bf1f848f226306558e6ea1bfb1a89 Mon Sep 17 00:00:00 2001 From: Skycoder42 Date: Sat, 30 Sep 2017 22:22:21 +0200 Subject: [PATCH] fixed library parts --- qhotkey.prc | 6 ++++++ qhotkey.pri | 20 ++++++++------------ qpm.json | 2 +- qpmx.json | 2 +- 4 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 qhotkey.prc diff --git a/qhotkey.prc b/qhotkey.prc new file mode 100644 index 0000000..30e2b04 --- /dev/null +++ b/qhotkey.prc @@ -0,0 +1,6 @@ +mac: LIBS += -framework Carbon +else:win32: LIBS += -luser32 +else:unix { + QT += x11extras + LIBS += -lX11 +} diff --git a/qhotkey.pri b/qhotkey.pri index 70e4cdf..d1a7d91 100644 --- a/qhotkey.pri +++ b/qhotkey.pri @@ -1,20 +1,16 @@ CONFIG += C++11 -HEADERS += $$PWD/QHotkey/qhotkey.h \ +PUBLIC_HEADERS += $$PWD/QHotkey/qhotkey.h + +HEADERS += $$PUBLIC_HEADERS \ $$PWD/QHotkey/qhotkey_p.h SOURCES += $$PWD/QHotkey/qhotkey.cpp -mac { - SOURCES += $$PWD/QHotkey/qhotkey_mac.cpp - LIBS += -framework Carbon -} else:win32 { - SOURCES += $$PWD/QHotkey/qhotkey_win.cpp - LIBS += -luser32 -} else:unix { - SOURCES += $$PWD/QHotkey/qhotkey_x11.cpp - QT += x11extras - LIBS += -lX11 -} +mac: SOURCES += $$PWD/QHotkey/qhotkey_mac.cpp +else:win32: SOURCES += $$PWD/QHotkey/qhotkey_win.cpp +else:unix: SOURCES += $$PWD/QHotkey/qhotkey_x11.cpp INCLUDEPATH += $$PWD/QHotkey + +include($$PWD/qhotkey.prc) diff --git a/qpm.json b/qpm.json index 4fd1161..093bb63 100644 --- a/qpm.json +++ b/qpm.json @@ -15,7 +15,7 @@ }, "version": { "fingerprint": "", - "label": "1.2.0", + "label": "1.2.1", "revision": "" }, "webpage": "https://github.com/Skycoder42/QHotkey" diff --git a/qpmx.json b/qpmx.json index 9c03280..bea438f 100644 --- a/qpmx.json +++ b/qpmx.json @@ -5,7 +5,7 @@ "file": "LICENSE", "name": "BSD_3_CLAUSE" }, - "prcFile": "", + "prcFile": "qhotkey.prc", "priFile": "qhotkey.pri", "priIncludes": [ ],