From 2fa036d5898ffd3dee5f4c396b09c7d904c49b5e Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 27 Jan 2011 19:26:26 +0000 Subject: Aviod conflicts with Qt4 namespace members git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1217530 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kinit/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kinit') diff --git a/kinit/Makefile.am b/kinit/Makefile.am index 4328af871..1f887538a 100644 --- a/kinit/Makefile.am +++ b/kinit/Makefile.am @@ -33,7 +33,7 @@ AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS) kdeinit_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \ $(KDE_RPATH) -kdeinit_LDADD = $(LIB_KPARTS) +kdeinit_LDADD = $(LIB_KPARTS) -lXft $(LIB_QT) kioslave_SOURCES = kioslave.cpp kioslave_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \ @@ -60,7 +60,7 @@ klauncher_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/l klauncher_la_SOURCES = klauncher.cpp klauncher_main.cpp autostart.cpp kstartupconfig_SOURCES = kstartupconfig.cpp -kstartupconfig_LDADD = $(top_builddir)/kdecore/libkdefakes.la +kstartupconfig_LDADD = $(top_builddir)/kdecore/libkdefakes.la $(LIB_QT) kdostartupconfig_SOURCES = kdostartupconfig.cpp kdostartupconfig_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \ $(KDE_RPATH) -- cgit v1.2.1