dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove builtin qtwin and use WinExtras, replace some macros

Browse Source
This commit is contained in:
Jonas Kvinge
2018-09-15 13:07:51 +02:00
parent 072facdf7b
commit 6563bec7e4
16 changed files with 50 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
3rdparty/qxt/qxtglobalshortcut_p.h vendored
View File

@@ -59,7 +59,7 @@ public:
bool unsetShortcut();
static bool error;
#ifndef Q_WS_MAC
#ifndef Q_OS_MAC
static int ref;
#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
static QAbstractEventDispatcher::EventFilter prevEventFilter;
@@ -67,7 +67,7 @@ public:
#else
virtual bool nativeEventFilter(const QByteArray & eventType, void * message, long * result);
#endif // QT_VERSION < QT_VERSION_CHECK(5,0,0)
#endif // Q_WS_MAC
#endif // Q_OS_MAC
static void activateShortcut(quint32 nativeKey, quint32 nativeMods);