From 160690324586d10a4134102af5be46cc8d4b020b Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Tue, 29 Mar 2016 08:21:27 -0400 Subject: Remove the Q_DECL_OVERRIDE tag from the end of the native event filter function declaration: This causes build issues on Qt 5.6, but removing it does not appear to make a difference on Qt 5.5.1 --- lumina-desktop/LXcbEventFilter.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lumina-desktop/LXcbEventFilter.cpp b/lumina-desktop/LXcbEventFilter.cpp index aa38002b..7ee4f974 100644 --- a/lumina-desktop/LXcbEventFilter.cpp +++ b/lumina-desktop/LXcbEventFilter.cpp @@ -26,8 +26,7 @@ void XCBEventFilter::setTrayDamageFlag(int flag){ } //This function format taken directly from the Qt5.3 documentation -bool XCBEventFilter::nativeEventFilter(const QByteArray &eventType, void *message, long *) Q_DECL_OVERRIDE -{ +bool XCBEventFilter::nativeEventFilter(const QByteArray &eventType, void *message, long *){ if(stopping){ return false; } //don't do any parsing //qDebug() << "New Event"; if(eventType=="xcb_generic_event_t"){ -- cgit