From 08e5b55ee2bf1f741751c8ee8b9094123903d144 Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 11 Oct 2011 21:58:54 +0000 Subject: [PATCH] Fix kdeadmin FTBFS under oneiric git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeadmin@1258520 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- knetworkconf/knetworkconf/knetworkconf.cpp | 2 +- kpackage/Makefile.am | 2 +- kuser/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/knetworkconf/knetworkconf/knetworkconf.cpp b/knetworkconf/knetworkconf/knetworkconf.cpp index 1d8efd9..a769705 100644 --- a/knetworkconf/knetworkconf/knetworkconf.cpp +++ b/knetworkconf/knetworkconf/knetworkconf.cpp @@ -29,7 +29,7 @@ KNetworkConf::KNetworkConf(TQWidget *parent, const char *name) : DCOPObject("KNe klvProfilesList->setAllColumnsShowFocus(true); klvProfilesList->setRenameable(0,true); klvProfilesList->setRenameable(1,true); - TQToolTip::remove( &(TQListView)klvProfilesList ); + TQToolTip::remove( static_cast(klvProfilesList) ); tooltip = new KProfilesListViewToolTip(klvProfilesList); //Connect signals emmitted by the backend to know when data is ready to be painted. diff --git a/kpackage/Makefile.am b/kpackage/Makefile.am index 4f2791f..c8a19b0 100644 --- a/kpackage/Makefile.am +++ b/kpackage/Makefile.am @@ -20,7 +20,7 @@ kpackage_SOURCES = kpackage.cpp managementWidget.cpp packageDisplay.cpp \ kpackage_METASOURCES = AUTO # the library search path -kpackage_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kpackage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. diff --git a/kuser/Makefile.am b/kuser/Makefile.am index d431ec5..34f2dd8 100644 --- a/kuser/Makefile.am +++ b/kuser/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = -I.. -I$(top_srcdir)/kuser $(all_includes) # May be -D_XU_QUOTA -D_XU_SHADOW #AM_CXXFLAGS = $(KU_NIS) $(KU_QUOTA) $(QUOTACTL) -D_KU_DEBUG -kuser_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kuser_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kuser_LDADD = $(LIB_KDEUI) $(LIBCRYPT) $(LIBSHADOW) $(LIBGEN) $(LIB_KABC) -lkntlm ####### Files