From cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Tue, 15 Feb 2011 19:15:16 +0000
Subject: Allow kdebase to (mostly) function correctly with TQt for Qt4 Fix
 kicker tackbar handling under Classic mode (thanks to Ilya Chernykh for the
 patch) Fix a newly invalidated section of code under GCC 4.5.2
 (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47723#c6)

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1220927 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kcontrol/input/Makefile.am               | 2 +-
 kcontrol/input/xcursor/previewwidget.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kcontrol/input')

diff --git a/kcontrol/input/Makefile.am b/kcontrol/input/Makefile.am
index 7a852aa3e..7ac995b97 100644
--- a/kcontrol/input/Makefile.am
+++ b/kcontrol/input/Makefile.am
@@ -16,7 +16,7 @@ bin_PROGRAMS = kapplymousetheme
 
 kapplymousetheme_SOURCES = kapplymousetheme.cpp
 kapplymousetheme_LDFLAGS = $(all_libraries)
-kapplymousetheme_LDADD = $(LIB_XCURSOR) $(LIB_X11)
+kapplymousetheme_LDADD = $(LIB_XCURSOR) $(LIB_X11) $(LIB_QT)
 
 kde_module_LTLIBRARIES = kcm_input.la
 
diff --git a/kcontrol/input/xcursor/previewwidget.cpp b/kcontrol/input/xcursor/previewwidget.cpp
index e0b33cf1b..17bf227f4 100644
--- a/kcontrol/input/xcursor/previewwidget.cpp
+++ b/kcontrol/input/xcursor/previewwidget.cpp
@@ -286,7 +286,7 @@ PreviewWidget::~PreviewWidget()
 
 void PreviewWidget::setTheme( const TQString &theme )
 {
-	setUpdatesEnabled( false );
+	tqsetUpdatesEnabled( false );
 
 	int minHeight = previewSize + 20; // Minimum height of the preview widget
 	int maxHeight = height();         // Tallest cursor height
@@ -302,7 +302,7 @@ void PreviewWidget::setTheme( const TQString &theme )
 
 	current = -1;
 	setFixedSize( ( maxWidth + cursorSpacing ) * numCursors, kMax( maxHeight, minHeight ) );
-	setUpdatesEnabled( true );
+	tqsetUpdatesEnabled( true );
 	tqrepaint( false );
 }
 
-- 
cgit v1.2.1