diff --git a/HotkeyTest/HotkeyTest.pro b/HotkeyTest/HotkeyTest.pro index e193b8f..a43f662 100644 --- a/HotkeyTest/HotkeyTest.pro +++ b/HotkeyTest/HotkeyTest.pro @@ -11,7 +11,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = HotkeyTest TEMPLATE = app -include(../QHotkey/qhotkey.pri) +include(../qhotkey.pri) SOURCES += main.cpp\ hottestwidget.cpp diff --git a/QHotkey/qhotkey.pri b/QHotkey/qhotkey.pri index 9b4fb20..a7c9725 100644 --- a/QHotkey/qhotkey.pri +++ b/QHotkey/qhotkey.pri @@ -1,20 +1 @@ -CONFIG += C++11 - -HEADERS += $$PWD/qhotkey.h \ - $$PWD/qhotkey_p.h - -SOURCES += $$PWD/qhotkey.cpp - -mac { - SOURCES += $$PWD/qhotkey_mac.cpp - LIBS += -framework Carbon -} else:win32 { - SOURCES += $$PWD/qhotkey_win.cpp - LIBS += -lUser32 -} else:unix { - SOURCES += $$PWD/qhotkey_x11.cpp - QT += x11extras - LIBS += -lX11 -} - -INCLUDEPATH += $$PWD +message(The pri file has been moved one directory up! use that one instead) diff --git a/qhotkey.pri b/qhotkey.pri new file mode 100644 index 0000000..a76fcce --- /dev/null +++ b/qhotkey.pri @@ -0,0 +1,23 @@ +CONFIG += C++11 + +HEADERS += $$PWD/QHotkey/qhotkey.h \ + $$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 +} + +INCLUDEPATH += $$PWD/QHotkey + +DISTFILES += \ + $$PWD/QHotkey/qhotkey.pri