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

List:       kde-commits
Subject:    [kdelibs/frameworks] kdeui/widgets: Disable the use of KSelectionWatcher when using Qt4, since it re
From:       David Faure <faure+bluesystems () kde ! org>
Date:       2012-11-30 22:12:39
Message-ID: 20121130221239.8B9C5A60D2 () git ! kde ! org
[Download RAW message or body]

Git commit 65fb67c8da5db97254d6f0c8082424060727cda1 by David Faure.
Committed on 30/11/2012 at 23:14.
Pushed by dfaure into branch 'frameworks'.

Disable the use of KSelectionWatcher when using Qt4, since it requires Qt5.

M  +2    -2    kdeui/widgets/kmenubar.cpp

http://commits.kde.org/kdelibs/65fb67c8da5db97254d6f0c8082424060727cda1

diff --git a/kdeui/widgets/kmenubar.cpp b/kdeui/widgets/kmenubar.cpp
index 03d4da7..5ea47bf 100644
--- a/kdeui/widgets/kmenubar.cpp
+++ b/kdeui/widgets/kmenubar.cpp
@@ -171,7 +171,7 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level)
   d->topLevel = top_level;
   if ( isTopLevelMenu() )
   {
-#if HAVE_X11
+#if HAVE_X11 && QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) /*KSelectionWatcher requires Qt5*/
       d->selection = new KSelectionWatcher( KMenuBarPrivate::makeSelectionAtom(),
           DefaultScreen( QX11Info::display()));
       connect( d->selection, SIGNAL(newOwner(Window)),
@@ -286,7 +286,7 @@ void KMenuBar::updateFallbackSize()
 {
     if( !d->topLevel )
 	return;
-#if HAVE_X11
+#if HAVE_X11 && QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     if( d->selection->owner() != None )
 #endif
     { // somebody is managing us, don't mess anything, undo changes
[prev in list] [next in list] [prev in thread] [next in thread]