diff options
| author | Ken Moore <moorekou@gmail.com> | 2016-03-29 08:21:27 -0400 |
|---|---|---|
| committer | Ken Moore <moorekou@gmail.com> | 2016-03-29 08:21:27 -0400 |
| commit | 160690324586d10a4134102af5be46cc8d4b020b (patch) | |
| tree | 1cfb0fb13116fe6f944f1b8d52ae3b97213dfb34 | |
| parent | Merge pull request #209 from q5sys/master (diff) | |
| download | lumina-160690324586d10a4134102af5be46cc8d4b020b.tar.gz lumina-160690324586d10a4134102af5be46cc8d4b020b.tar.bz2 lumina-160690324586d10a4134102af5be46cc8d4b020b.zip | |
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
| -rw-r--r-- | lumina-desktop/LXcbEventFilter.cpp | 3 |
1 files changed, 1 insertions, 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"){ |