[poppler] poppler/qt: Makefile.am, 1.2, 1.3 test-poppler-qt.cpp, 1.3, 1.4

[Kristian Hogsberg]

Update of /cvs/poppler/poppler/qt
In directory gabe:/tmp/cvs-serv1441/qt

Modified Files:
	Makefile.am test-poppler-qt.cpp 
Log Message:
2005-05-06  Kristian Høgsberg  <krh at redhat.com>

        * glib/Makefile.am (libpoppler_glib_la_LIBADD): Link poppler-glib
        against poppler.

        * qt/Makefile.am (libpoppler_qt_la_LIBADD): Ditto for qt.

        * poppler-glib.pc (Libs): Drop -lpoppler from link.

        * poppler-qt.pc (Libs): Ditto for qt.

        * configure.ac: Test for both libqt-mt.la and libqt-mt.so in that
        order.



Index: Makefile.am
===================================================================
RCS file: /cvs/poppler/poppler/qt/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	25 Apr 2005 18:04:32 -0000	1.2
+++ Makefile.am	6 May 2005 16:38:57 -0000	1.3
@@ -18,6 +18,7 @@
 	poppler-private.h
 
 libpoppler_qt_la_LIBADD= 			\
+	$(top_builddir)/poppler/libpoppler.la	\
 	$(POPPLER_QT_LIBS)			\
 	$(FREETYPE_LIBS)
 

Index: test-poppler-qt.cpp
===================================================================
RCS file: /cvs/poppler/poppler/qt/test-poppler-qt.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- test-poppler-qt.cpp	4 May 2005 19:11:11 -0000	1.3
+++ test-poppler-qt.cpp	6 May 2005 16:38:57 -0000	1.4
@@ -2,6 +2,7 @@
 #include <qpainter.h>
 #include <qpixmap.h>
 #include <qwidget.h>
+#include <qlabel.h>
 #include <qmessagebox.h>
 #include <qfile.h>
 #include <ctype.h>