Skip to content

Commit e9fc5e8

Browse files
author
gsherman
committed
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@5157 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent d350790 commit e9fc5e8

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

tests/src/core/Makefile.am

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,15 @@
1111
bin_PROGRAMS = testqgsapplication
1212

1313

14-
%.moc.cpp: %.cpp
14+
%.moc.cpp: %.h
1515
$(MOC) -o $@ $<
1616

1717
testqgsapplication_MOC = testqgsapplication.moc.cpp
18-
testqgsapplication_SOURCES = $(testqgsapplication_MOC) testqgsapplication.h testqgsapplication.cpp
18+
testqgsapplication_SOURCES = testqgsapplication.cpp
1919

20-
testqgsapplication_LDADD = $(QT_LDADD) $(PG_LIB) $(GDAL_LDADD) -lproj ../../../src/core/libqgis_core.la ../../../src/gui/libqgis_gui.la
20+
testqgsapplication_LDADD = $(QT_LDADD) $(PG_LIB) $(GDAL_LDADD) -lproj ../../../src/core/libqgis_core.la ../../../src/gui/libqgis_gui.la -lQtTest
2121
testqgsapplication_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(PG_INC) -I../../../src/core
2222

23+
BUILT_SOURCES = $(testqgsapplication_MOC)
24+
25+
CLEANFILES = $(BUILT_SOURCES)

tests/src/core/testqgsapplication.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <QtTest>
1+
#include <QtTest/QtTest>
22
#include <qgsapplication.h>
33
#include "testqgsapplication.h"
44
#include <QObject>
@@ -10,11 +10,13 @@ TestQgsApplication::TestQgsApplication() : QObject()
1010

1111
}
1212

13+
1314
TestQgsApplication::~TestQgsApplication()
1415
{
1516

1617
}
1718

19+
1820
void TestQgsApplication::authorsFilePath()
1921
{
2022
QString myPath = QgsApplication::authorsFilePath();

0 commit comments

Comments
 (0)