qgis/helpviewer should now be compilable under Qt4; Makefile.am more closely follows (e.g.) qgis/plugins/grass, which makes "make clean" work properly.

After this commit you should re-configure qgis, make clean in qgis/helpviewer then build as normal.


git-svn-id: http://svn.osgeo.org/qgis/trunk@4266 c8812cc2-4d05-0410-92ff-de0c093fc19c

helpviewer/Makefile.am

@@ -21,9 +21,14 @@ PKGDATAPATH=-DPKGDATAPATH=\"$(pkgdatadir)\"
 
 %.h: %.ui
 	$(UIC) -o $@ $<
+if HAVE_QT4
+	../tools/qgis-qt3to4.pl -uic $@
+endif
 
+if !NO_UIC_IMPLEMENTATIONS
 %.cpp: %.ui
 	$(UIC) -o $@ -impl $*.h $<
+endif
 
 
 
@@ -50,7 +55,9 @@ qgis_help_LDADD = $(LDADD) $(QT_LDADD) -lsqlite3
 
 qgis_help_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(PKGDATAPATH)
 
-#EXTRA_DIST = $(qgis_help_UIC) icon.xpm
+CLEANFILES = $(BUILT_SOURCES)
+
+EXTRA_DIST = $(qgis_help_UIC) icon.xpm
 
 # Qt/Mac app needs to be inside a bundle to function correctly
 MACBINDIR = $(bindir)/qgis_help.app/Contents/MacOS

helpviewer/helpviewer.pro

@@ -13,3 +13,8 @@ LIBS += $(SQLITE3)\sqlite3.lib
 HEADERS += qgshelpserver.h qgshelpviewer.h
 INTERFACES += qgshelpviewerbase.ui
 SOURCES += main.cpp qgshelpserver.cpp qgshelpviewer.cpp
+#The following line was inserted by qt3to4
+QT +=  qt3support 
+#The following line was inserted by qt3to4
+CONFIG += uic3
+

helpviewer/qgshelpviewerbase.ui

@@ -43,10 +43,10 @@
                 </property>
                 <spacer>
                     <property name="name">
-                        <cstring>Horizontal Spacing2</cstring>
+                        <cstring>Qt::Horizontal Spacing2</cstring>
                     </property>
                     <property name="orientation">
-                        <enum>Horizontal</enum>
+                        <enum>Qt::Horizontal</enum>
                     </property>
                     <property name="sizeType">
                         <enum>Expanding</enum>