diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-30 10:07:42 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-30 10:07:42 +0100 |
| commit | 48c30a3d75d18e87e39c18cb52961bb37ab6055e (patch) | |
| tree | 1d6f2faa511eed9f6dac6630673efa6564ea7027 /qxt-mini | |
| parent | 8318ee4d821a4826b8e80369f499b3758abe8f4c (diff) | |
qxt: fix unix build
Diffstat (limited to 'qxt-mini')
| -rw-r--r-- | qxt-mini/qxtglobal.h | 4 | ||||
| -rw-r--r-- | qxt-mini/qxtglobalshortcut.cpp | 1 | ||||
| -rw-r--r-- | qxt-mini/qxtglobalshortcut_mac.cpp (renamed from qxt-mini/plat/qxtglobalshortcut_mac.cpp) | 3 | ||||
| -rw-r--r-- | qxt-mini/qxtglobalshortcut_x11.cpp (renamed from qxt-mini/plat/qxtglobalshortcut_x11.cpp) | 5 |
4 files changed, 9 insertions, 4 deletions
diff --git a/qxt-mini/qxtglobal.h b/qxt-mini/qxtglobal.h index fa592181..574482ae 100644 --- a/qxt-mini/qxtglobal.h +++ b/qxt-mini/qxtglobal.h @@ -51,9 +51,7 @@ #define QXT_DLLEXPORT DO_NOT_USE_THIS_ANYMORE -#define QXT_STATIC - -#if !defined(QXT_STATIC) && !defined(QXT_DOXYGEN_RUN) +#ifdef QXT_BUILD # if defined(BUILD_QXT_CORE) # define QXT_CORE_EXPORT Q_DECL_EXPORT # else diff --git a/qxt-mini/qxtglobalshortcut.cpp b/qxt-mini/qxtglobalshortcut.cpp index 45576d37..4b400a72 100644 --- a/qxt-mini/qxtglobalshortcut.cpp +++ b/qxt-mini/qxtglobalshortcut.cpp @@ -1,3 +1,4 @@ +#define QXT_BUILD #include "qxtglobalshortcut.h" /**************************************************************************** ** Copyright (c) 2006 - 2011, the LibQxt project. diff --git a/qxt-mini/plat/qxtglobalshortcut_mac.cpp b/qxt-mini/qxtglobalshortcut_mac.cpp index 1181b293..34de694e 100644 --- a/qxt-mini/plat/qxtglobalshortcut_mac.cpp +++ b/qxt-mini/qxtglobalshortcut_mac.cpp @@ -1,3 +1,5 @@ +#ifdef __APPLE__ +#define QXT_BUILD #include <Carbon/Carbon.h> /**************************************************************************** ** Copyright (c) 2006 - 2011, the LibQxt project. @@ -266,3 +268,4 @@ bool QxtGlobalShortcutPrivate::nativeEventFilter(const QByteArray & eventType, { return false; } +#endif diff --git a/qxt-mini/plat/qxtglobalshortcut_x11.cpp b/qxt-mini/qxtglobalshortcut_x11.cpp index f18f86db..b13770a2 100644 --- a/qxt-mini/plat/qxtglobalshortcut_x11.cpp +++ b/qxt-mini/qxtglobalshortcut_x11.cpp @@ -1,4 +1,6 @@ -#include "../qxtglobalshortcut_p.h" +#ifndef __APPLE_ +#define QXT_BUILD +#include "qxtglobalshortcut_p.h" /**************************************************************************** ** Copyright (c) 2006 - 2011, the LibQxt project. ** See the Qxt AUTHORS file for a list of authors and copyright holders. @@ -233,3 +235,4 @@ bool QxtGlobalShortcutPrivate::unregisterShortcut(quint32 nativeKey, quint32 nat QxtX11Data x11; return x11.isValid() && x11.ungrabKey(nativeKey, nativeMods, x11.rootWindow()); } +#endif |