iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Qxt Qt5 build?

Browse Source
This commit is contained in:
craig.p.drummond
2014-06-01 10:16:24 +00:00
parent 3a839af001
commit d2f9f1c823
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
3rdparty/qxt/CMakeLists.txt vendored
View File

@@ -9,8 +9,12 @@ set(QXT-MOC-HEADERS
qxtglobalshortcut.h
)
find_package(X11)
include_directories(${X11_INCLUDE_DIR})
if (NOT WIN32 AND NOT APPLE)
find_package(X11)
include_directories(${X11_INCLUDE_DIR})
endif (NOT WIN32 AND NOT APPLE)
include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QTINCLUDES} )
if(WIN32)
set(QXT-SOURCES ${QXT-SOURCES} qxtglobalshortcut_win.cpp)

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

@@ -35,7 +35,11 @@
#include <QKeySequence>
#include <QHash>
#if QT_VERSION>=0x050000
class QxtGlobalShortcutPrivate : public QAbstractNativeEventFilter, public QxtPrivate<QxtGlobalShortcut>
#else
class QxtGlobalShortcutPrivate : public QxtPrivate<QxtGlobalShortcut>
#endif
{
public:
QXT_DECLARE_PUBLIC(QxtGlobalShortcut)
@@ -55,7 +59,7 @@ public:
static QAbstractEventDispatcher::EventFilter prevEventFilter;
static bool eventFilter(void* message);
#else
bool nativeEventFilter(const QByteArray &, void *message, long *result)
bool nativeEventFilter(const QByteArray &, void *message, long *result);
#endif
private: