Merge branch 'pr8'

This commit is contained in:
Skycoder42
2017-10-23 15:36:32 +02:00
5 changed files with 36 additions and 8 deletions
+2 -1
View File
@@ -1,7 +1,8 @@
TEMPLATE = subdirs
SUBDIRS += \
HotkeyTest
HotkeyTest \
QHotkey
DISTFILES += README.md \
LICENSE \
+16
View File
@@ -0,0 +1,16 @@
TEMPLATE = lib
win32: CONFIG += dll
TARGET = QHotkey
VERSION = 1.2.1
include(../qhotkey.pri)
DEFINES += QHOTKEY_LIB QHOTKEY_LIB_BUILD
# use INSTALL_ROOT to modify the install location
headers.files = $$PUBLIC_HEADERS
headers.path = $$[QT_INSTALL_HEADERS]
target.path = $$[QT_INSTALL_LIBS]
INSTALLS += target headers
+15 -5
View File
@@ -6,8 +6,18 @@
#include <QPair>
#include <QLoggingCategory>
#ifdef QHOTKEY_LIB
#ifdef QHOTKEY_LIB_BUILD
#define QHOTKEY_SHARED_EXPORT Q_DECL_EXPORT
#else
#define QHOTKEY_SHARED_EXPORT Q_DECL_IMPORT
#endif
#else
#define QHOTKEY_SHARED_EXPORT
#endif
//! A class to define global, systemwide Hotkeys
class QHotkey : public QObject
class QHOTKEY_SHARED_EXPORT QHotkey : public QObject
{
Q_OBJECT
friend class QHotkeyPrivate;
@@ -19,7 +29,7 @@ class QHotkey : public QObject
public:
//! Defines shortcut with native keycodes
class NativeShortcut {
class QHOTKEY_SHARED_EXPORT NativeShortcut {
public:
//! The native keycode
quint32 key;
@@ -95,9 +105,9 @@ private:
bool _registered;
};
uint qHash(const QHotkey::NativeShortcut &key);
uint qHash(const QHotkey::NativeShortcut &key, uint seed);
uint QHOTKEY_SHARED_EXPORT qHash(const QHotkey::NativeShortcut &key);
uint QHOTKEY_SHARED_EXPORT qHash(const QHotkey::NativeShortcut &key, uint seed);
Q_DECLARE_LOGGING_CATEGORY(logQHotkey)
QHOTKEY_SHARED_EXPORT Q_DECLARE_LOGGING_CATEGORY(logQHotkey)
#endif // QHOTKEY_H
+1 -1
View File
@@ -7,7 +7,7 @@
#include <QMutex>
#include <QGlobalStatic>
class QHotkeyPrivate : public QObject, public QAbstractNativeEventFilter
class QHOTKEY_SHARED_EXPORT QHotkeyPrivate : public QObject, public QAbstractNativeEventFilter
{
Q_OBJECT
+2 -1
View File
@@ -1,6 +1,7 @@
CONFIG += C++11
PUBLIC_HEADERS += $$PWD/QHotkey/qhotkey.h
PUBLIC_HEADERS += $$PWD/QHotkey/qhotkey.h \
$$PWD/QHotkey/QHotkey
HEADERS += $$PUBLIC_HEADERS \
$$PWD/QHotkey/qhotkey_p.h