Fixes to test harness application. Now compiles and runs but doesn't …

…do anything useful yet. git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5157 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 4, 2006 · 8bc2458 · 8bc2458
1 parent b9840d9
commit 8bc2458
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/tests/src/core/Makefile.am b/tests/src/core/Makefile.am
@@ -11,12 +11,15 @@
 bin_PROGRAMS = testqgsapplication
 
 
-%.moc.cpp: %.cpp
+%.moc.cpp: %.h
 	$(MOC) -o $@ $<
 
 testqgsapplication_MOC = testqgsapplication.moc.cpp
-testqgsapplication_SOURCES = $(testqgsapplication_MOC) testqgsapplication.h testqgsapplication.cpp 
+testqgsapplication_SOURCES = testqgsapplication.cpp 
 
-testqgsapplication_LDADD = $(QT_LDADD) $(PG_LIB) $(GDAL_LDADD) -lproj ../../../src/core/libqgis_core.la ../../../src/gui/libqgis_gui.la 
+testqgsapplication_LDADD = $(QT_LDADD) $(PG_LIB) $(GDAL_LDADD) -lproj ../../../src/core/libqgis_core.la ../../../src/gui/libqgis_gui.la  -lQtTest
 testqgsapplication_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(PG_INC)  -I../../../src/core
 
+BUILT_SOURCES = $(testqgsapplication_MOC)
+
+CLEANFILES = $(BUILT_SOURCES)
diff --git a/tests/src/core/testqgsapplication.cpp b/tests/src/core/testqgsapplication.cpp
@@ -1,4 +1,4 @@
-#include <QtTest>
+#include <QtTest/QtTest>
 #include <qgsapplication.h>
 #include "testqgsapplication.h"
 #include <QObject>
@@ -10,11 +10,13 @@ TestQgsApplication::TestQgsApplication() : QObject()
 
 }
 
+
 TestQgsApplication::~TestQgsApplication()
 {
 
 }
 
+
 void TestQgsApplication::authorsFilePath()
 {
   QString myPath = QgsApplication::authorsFilePath();