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 --- khtml/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'khtml/Makefile.am') diff --git a/khtml/Makefile.am b/khtml/Makefile.am index 82eca8120..6892ef0c9 100644 --- a/khtml/Makefile.am +++ b/khtml/Makefile.am @@ -67,7 +67,7 @@ dummy.cpp: $(srcdir)/Makefile.am libkhtmlpart_la_SOURCES = dummy.cpp libkhtmlpart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) -libkhtmlpart_la_LIBADD = libkhtml.la +libkhtmlpart_la_LIBADD = libkhtml.la $(LIB_QT) # init_khtmlimagefactory is in libkhtml.so; init_khtmlimagepart needs to be in the part imgdummy.cpp: $(srcdir)/Makefile.am @@ -77,7 +77,7 @@ imgdummy.cpp: $(srcdir)/Makefile.am khtmlimagepart_la_SOURCES = imgdummy.cpp khtmlimagepart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) -khtmlimagepart_la_LIBADD = libkhtml.la +khtmlimagepart_la_LIBADD = libkhtml.la $(LIB_QT) INCLUDES = -I$(top_srcdir)/kjs -I$(top_builddir)/kjs -I$(top_srcdir)/kimgio \ -I$(srcdir)/java -I$(top_srcdir)/dcop -I$(srcdir)/misc \ -- cgit v1.2.1