[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdelibs/frameworks] tier1/kwindowsystem/src: Fix qt version check, and fix compilation with qt5 (qt
From:       David Faure <faure+bluesystems () kde ! org>
Date:       2012-12-23 15:54:24
Message-ID: 20121223155424.AC344A6091 () git ! kde ! org
[Download RAW message or body]

Git commit 3f6fe4825a646eadb29505516a12658765b817e1 by David Faure.
Committed on 23/12/2012 at 16:49.
Pushed by dfaure into branch 'frameworks'.

Fix qt version check, and fix compilation with qt5 (qtbase stable is now 5.0.1)

M  +8    -4    tier1/kwindowsystem/src/kmanagerselection.cpp

http://commits.kde.org/kdelibs/3f6fe4825a646eadb29505516a12658765b817e1

diff --git a/tier1/kwindowsystem/src/kmanagerselection.cpp \
b/tier1/kwindowsystem/src/kmanagerselection.cpp index 4d8bad3..62b0559 100644
--- a/tier1/kwindowsystem/src/kmanagerselection.cpp
+++ b/tier1/kwindowsystem/src/kmanagerselection.cpp
@@ -28,7 +28,11 @@ DEALINGS IN THE SOFTWARE.
 
 #include <QtCore/QObject>
 #include <QtCore/QBasicTimer>
+#include <QtCore/QCoreApplication>
 #include <QTimerEvent>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#include <QAbstractNativeEventFilter>
+#endif
 
 #include <qx11info_x11.h>
 #include <qwidget.h>
@@ -60,7 +64,7 @@ static xcb_atom_t intern_atom(xcb_connection_t *c, const char \
*name)  }
 
 class KSelectionOwner::Private
-#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     : public QAbstractNativeEventFilter
 #endif
 {
@@ -79,7 +83,7 @@ public:
           force_kill(false),
           owner(owner_P)
     {
-#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
         QCoreApplication::instance()->installNativeEventFilter(this);
 #endif
     }
@@ -530,7 +534,7 @@ xcb_atom_t KSelectionOwner::Private::xa_timestamp = XCB_NONE;
 
 
 class KSelectionWatcher::Private
-#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     : public QAbstractNativeEventFilter
 #endif
 {
@@ -541,7 +545,7 @@ public:
           selection_owner(XCB_NONE),
           watcher(watcher_P)
     {
-#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
         QCoreApplication::instance()->installNativeEventFilter(this);
 #endif
     }


[prev in list] [next in list] [prev in thread] [next in thread]