sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

- by golly, someone moved QgsScaleCalculator units to QGis

Browse Source 
- using the various *config utils generates -I strings that apparently flummox
  qmake; so now strip those out before appending the include strings generated
  from config script invocations

The test suite now runs again successfully.  Go me.  Or something.


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3959 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
mcoletti 2005-09-23 02:24:56 +00:00
parent 8a0d9f3c32
commit ffb3bafc0e
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/qgsproject/projecttest.h
View File

@ -11,6 +11,7 @@ using namespace std;
#include <cppunit/extensions/HelperMacros.h>
#include <qgsproject.h>
#include <qgis.h>
#include <qgsexception.h>
#include <qstring.h>
@ -107,18 +108,18 @@ class ProjectTest : public CppUnit::TestFixture
void testMapUnits()
{
QgsProject::instance()->dirty( false );
QgsProject::instance()->mapUnits( QgsScaleCalculator::METERS );
CPPUNIT_ASSERT( QgsScaleCalculator::METERS == QgsProject::instance()->mapUnits() );
QgsProject::instance()->mapUnits( QGis::METERS );
CPPUNIT_ASSERT( QGis::METERS == QgsProject::instance()->mapUnits() );
CPPUNIT_ASSERT( QgsProject::instance()->dirty() );
QgsProject::instance()->dirty( false );
QgsProject::instance()->mapUnits( QgsScaleCalculator::FEET );
CPPUNIT_ASSERT( QgsScaleCalculator::FEET == QgsProject::instance()->mapUnits() );
QgsProject::instance()->mapUnits( QGis::FEET );
CPPUNIT_ASSERT( QGis::FEET == QgsProject::instance()->mapUnits() );
CPPUNIT_ASSERT( QgsProject::instance()->dirty() );
QgsProject::instance()->dirty( false );
QgsProject::instance()->mapUnits( QgsScaleCalculator::DEGREES );
CPPUNIT_ASSERT( QgsScaleCalculator::DEGREES == QgsProject::instance()->mapUnits() );
QgsProject::instance()->mapUnits( QGis::DEGREES );
CPPUNIT_ASSERT( QGis::DEGREES == QgsProject::instance()->mapUnits() );
CPPUNIT_ASSERT( QgsProject::instance()->dirty() );
} // testMapUnits

5
tests/qgsproject/qgsproject.pro
View File

@ -16,15 +16,18 @@ GDAL_DEPS = $$system(gdal-config --dep-libs)
# get gdal inludes
GDAL_INC = $$system(gdal-config --cflags)
INCLUDEPATH += . $$GDAL_INC
GDAL_INC ~= s/-I//g
INCLUDEPATH += $$GDAL_INC
# cppunit
CPPUNIT_INC = $$system(cppunit-config --cflags)
CPPUNIT_INC ~= s/-I//g
INCLUDEPATH += $$CPPUNIT_INC
CPPUNIT_LIBS = $$system(cppunit-config --libs)
# qgis
QGIS_INC = $$system(qgis-config --cflags)
QGIS_INC ~= s/-I//g
INCLUDEPATH += $$QGIS_INC
QGIS_LIBS = $$system(qgis-config --lib)