summaryrefslogtreecommitdiffstats
path: root/khtml/Makefile.am
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-27 19:26:26 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-27 19:26:26 +0000
commit2fa036d5898ffd3dee5f4c396b09c7d904c49b5e (patch)
tree61105eaaae5fb7bc23dd0f4e51e5a28fb722603a /khtml/Makefile.am
parentda24d1f16d7461aec72b5a8f3a797acf73d7e6fd (diff)
downloadtdelibs-2fa036d5898ffd3dee5f4c396b09c7d904c49b5e.tar.gz
tdelibs-2fa036d5898ffd3dee5f4c396b09c7d904c49b5e.zip
Aviod conflicts with Qt4 namespace members
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1217530 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khtml/Makefile.am')
-rw-r--r--khtml/Makefile.am4
1 files changed, 2 insertions, 2 deletions
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 \