mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-14 00:07:35 -04:00
Switch tests to automoc
Required for Qt5 compatibility Raises minimum CMake version to 2.8.6
This commit is contained in:
Matthias Kuhn
parent
f46e68363f
commit
1c2bdf1ea3
@ -18,7 +18,7 @@ MESSAGE(STATUS "QGIS version: ${COMPLETE_VERSION} ${RELEASE_NAME} (${QGIS_VERSIO
|
||||
#############################################################
|
||||
# CMake settings
|
||||
|
||||
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0)
|
||||
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.6)
|
||||
|
||||
SET(CMAKE_COLOR_MAKEFILE ON)
|
||||
|
||||
|
||||
2
INSTALL
2
INSTALL
@ -92,7 +92,7 @@ Following a summary of the required dependencies for building:
|
||||
|
||||
Required build tools:
|
||||
|
||||
- CMake >= 2.8.0
|
||||
- CMake >= 2.8.6
|
||||
- Flex
|
||||
- Bison >= 2.4
|
||||
|
||||
|
||||
@ -55,10 +55,8 @@ ENDIF (APPLE)
|
||||
MACRO (ADD_QGIS_TEST testname testsrc)
|
||||
SET(qgis_${testname}_SRCS ${testsrc} ${util_SRCS})
|
||||
SET(qgis_${testname}_MOC_CPPS ${testsrc})
|
||||
QT4_WRAP_CPP(qgis_${testname}_MOC_SRCS ${qgis_${testname}_MOC_CPPS})
|
||||
ADD_CUSTOM_TARGET(qgis_${testname}moc ALL DEPENDS ${qgis_${testname}_MOC_SRCS})
|
||||
ADD_EXECUTABLE(qgis_${testname} ${qgis_${testname}_SRCS})
|
||||
ADD_DEPENDENCIES(qgis_${testname} qgis_${testname}moc)
|
||||
SET_TARGET_PROPERTIES(qgis_${testname} PROPERTIES AUTOMOC TRUE)
|
||||
TARGET_LINK_LIBRARIES(qgis_${testname}
|
||||
${QT_QTCORE_LIBRARY}
|
||||
${QT_QTTEST_LIBRARY}
|
||||
|
||||
@ -190,4 +190,4 @@ void TestOpenStreetMap::importAndQueries()
|
||||
|
||||
QTEST_MAIN( TestOpenStreetMap )
|
||||
|
||||
#include "moc_testopenstreetmap.cxx"
|
||||
#include "testopenstreetmap.moc"
|
||||
|
||||
@ -130,4 +130,4 @@ void TestQgsVectorAnalyzer::layerExtent()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsVectorAnalyzer )
|
||||
#include "moc_testqgsvectoranalyzer.cxx"
|
||||
#include "testqgsvectoranalyzer.moc"
|
||||
|
||||
@ -117,4 +117,4 @@ void TestQgsZonalStatistics::testStatistics()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsZonalStatistics )
|
||||
#include "moc_testqgszonalstatistics.cxx"
|
||||
#include "testqgszonalstatistics.moc"
|
||||
|
||||
@ -54,11 +54,9 @@ ENDIF (APPLE)
|
||||
|
||||
MACRO (ADD_QGIS_TEST testname testsrc)
|
||||
SET(qgis_${testname}_SRCS ${testsrc} ${util_SRCS})
|
||||
SET(qgis_${testname}_MOC_CPPS ${testsrc})
|
||||
QT4_WRAP_CPP(qgis_${testname}_MOC_SRCS ${qgis_${testname}_MOC_CPPS})
|
||||
ADD_CUSTOM_TARGET(qgis_${testname}moc ALL DEPENDS ${qgis_${testname}_MOC_SRCS})
|
||||
ADD_EXECUTABLE(qgis_${testname} ${qgis_${testname}_SRCS})
|
||||
ADD_DEPENDENCIES(qgis_${testname} qgis_${testname}moc)
|
||||
SET_TARGET_PROPERTIES(qgis_${testname} PROPERTIES AUTOMOC TRUE)
|
||||
TARGET_LINK_LIBRARIES(qgis_${testname}
|
||||
${QT_QTXML_LIBRARY}
|
||||
${QT_QTCORE_LIBRARY}
|
||||
|
||||
@ -100,4 +100,4 @@ void TestQgisAppClipboard::copyPaste()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgisAppClipboard )
|
||||
#include "moc_testqgisappclipboard.cxx"
|
||||
#include "testqgisappclipboard.moc"
|
||||
|
||||
@ -55,10 +55,8 @@ ENDIF (APPLE)
|
||||
MACRO (ADD_QGIS_TEST testname testsrc)
|
||||
SET(qgis_${testname}_SRCS ${testsrc} ${util_SRCS})
|
||||
SET(qgis_${testname}_MOC_CPPS ${testsrc})
|
||||
QT4_WRAP_CPP(qgis_${testname}_MOC_SRCS ${qgis_${testname}_MOC_CPPS})
|
||||
ADD_CUSTOM_TARGET(qgis_${testname}moc ALL DEPENDS ${qgis_${testname}_MOC_SRCS})
|
||||
ADD_EXECUTABLE(qgis_${testname} ${qgis_${testname}_SRCS})
|
||||
ADD_DEPENDENCIES(qgis_${testname} qgis_${testname}moc)
|
||||
SET_TARGET_PROPERTIES(qgis_${testname} PROPERTIES AUTOMOC TRUE)
|
||||
TARGET_LINK_LIBRARIES(qgis_${testname}
|
||||
${QT_QTXML_LIBRARY}
|
||||
${QT_QTCORE_LIBRARY}
|
||||
|
||||
@ -160,4 +160,4 @@ void Regression1141::diacriticalTest()
|
||||
|
||||
|
||||
QTEST_MAIN( Regression1141 )
|
||||
#include "moc_regression1141.cxx"
|
||||
#include "regression1141.moc"
|
||||
|
||||
@ -123,4 +123,4 @@ void Regression992::regression992()
|
||||
}
|
||||
|
||||
QTEST_MAIN( Regression992 )
|
||||
#include "moc_regression992.cxx"
|
||||
#include "regression992.moc"
|
||||
|
||||
@ -27,7 +27,7 @@ class Test[testClassCamelCaseName]: public QObject
|
||||
};
|
||||
|
||||
QTEST_MAIN( Test[testClassCamelCaseName] )
|
||||
#include "test[testClassLowerCaseName].moc.cpp"
|
||||
#include "test[testClassLowerCaseName].moc"
|
||||
|
||||
|
||||
|
||||
|
||||
@ -103,5 +103,5 @@ void TestContrastEnhancements::linearMinMaxEnhancementTest()
|
||||
QVERIFY( 255.0 == myEnhancement.enhance( 240.0 ) );
|
||||
}
|
||||
QTEST_MAIN( TestContrastEnhancements )
|
||||
#include "moc_testcontrastenhancements.cxx"
|
||||
#include "testcontrastenhancements.moc"
|
||||
|
||||
|
||||
@ -276,4 +276,4 @@ void TestQgsMapRendererJob::testCache()
|
||||
|
||||
|
||||
QTEST_MAIN( TestQgsMapRendererJob )
|
||||
#include "moc_testmaprendererjob.cxx"
|
||||
#include "testmaprendererjob.moc"
|
||||
|
||||
@ -64,5 +64,5 @@ void TestQgsApplication::checkGdalSkip()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsApplication )
|
||||
#include "moc_testqgsapplication.cxx"
|
||||
#include "testqgsapplication.moc"
|
||||
|
||||
|
||||
@ -471,4 +471,4 @@ void TestQgsAtlasComposition::test_remove_layer()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsAtlasComposition )
|
||||
#include "moc_testqgsatlascomposition.cxx"
|
||||
#include "testqgsatlascomposition.moc"
|
||||
|
||||
@ -223,4 +223,4 @@ bool TestQgsBlendModes::imageCheck( QString theTestType )
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsBlendModes )
|
||||
#include "moc_testqgsblendmodes.cxx"
|
||||
#include "testqgsblendmodes.moc"
|
||||
|
||||
@ -86,4 +86,4 @@ bool TestQgsClipper::checkBoundingBox( QPolygonF polygon, QgsRectangle clipRect
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsClipper )
|
||||
#include "moc_testqgsclipper.cxx"
|
||||
#include "testqgsclipper.moc"
|
||||
|
||||
@ -155,4 +155,4 @@ void TestQgsColorScheme::clone()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsColorScheme )
|
||||
#include "moc_testqgscolorscheme.cxx"
|
||||
#include "testqgscolorscheme.moc"
|
||||
|
||||
@ -195,4 +195,4 @@ void TestQgsColorSchemeRegistry::matchingSchemes()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsColorSchemeRegistry )
|
||||
#include "moc_testqgscolorschemeregistry.cxx"
|
||||
#include "testqgscolorschemeregistry.moc"
|
||||
|
||||
@ -136,5 +136,5 @@ void TestQgsComposerDD::ddEvaluate()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsComposerDD )
|
||||
#include "moc_testqgscomposerdd.cxx"
|
||||
#include "testqgscomposerdd.moc"
|
||||
|
||||
|
||||
@ -108,4 +108,4 @@ void TestQgsComposerEffects::transparency()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsComposerEffects )
|
||||
#include "moc_testqgscomposereffects.cxx"
|
||||
#include "testqgscomposereffects.moc"
|
||||
|
||||
@ -176,4 +176,4 @@ void TestQgsComposerGroup::undoRedo()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsComposerGroup )
|
||||
#include "moc_testqgscomposergroup.cxx"
|
||||
#include "testqgscomposergroup.moc"
|
||||
|
||||
@ -222,4 +222,4 @@ void TestQgsComposerHtml::htmlMultiFrameSmartBreak()
|
||||
|
||||
|
||||
QTEST_MAIN( TestQgsComposerHtml )
|
||||
#include "moc_testqgscomposerhtml.cxx"
|
||||
#include "testqgscomposerhtml.moc"
|
||||
|
||||
@ -209,4 +209,4 @@ void TestQgsComposerLabel::marginMethods()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsComposerLabel )
|
||||
#include "moc_testqgscomposerlabel.cxx"
|
||||
#include "testqgscomposerlabel.moc"
|
||||
|
||||
@ -195,4 +195,4 @@ void TestQgsComposerMap::mapPolygonVertices()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsComposerMap )
|
||||
#include "moc_testqgscomposermap.cxx"
|
||||
#include "testqgscomposermap.moc"
|
||||
|
||||
@ -584,4 +584,4 @@ void TestQgsComposerMapGrid::annotationFormats()
|
||||
|
||||
|
||||
QTEST_MAIN( TestQgsComposerMapGrid )
|
||||
#include "moc_testqgscomposermapgrid.cxx"
|
||||
#include "testqgscomposermapgrid.moc"
|
||||
|
||||
@ -201,4 +201,4 @@ void TestQgsComposerMapOverview::overviewMapCenter()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsComposerMapOverview )
|
||||
#include "moc_testqgscomposermapoverview.cxx"
|
||||
#include "testqgscomposermapoverview.moc"
|
||||
|
||||
@ -586,4 +586,4 @@ void TestQgsComposerModel::reorderToBottomWithRemoved()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsComposerModel )
|
||||
#include "moc_testqgscomposermodel.cxx"
|
||||
#include "testqgscomposermodel.moc"
|
||||
|
||||
@ -349,4 +349,4 @@ void TestQgsComposerMultiFrame::undoRedoRemovedFrame()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsComposerMultiFrame )
|
||||
#include "moc_testqgscomposermultiframe.cxx"
|
||||
#include "testqgscomposermultiframe.moc"
|
||||
|
||||
@ -231,4 +231,4 @@ bool TestQgsComposerObject::renderCheck( QString testName, QImage &image, int mi
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsComposerObject )
|
||||
#include "moc_testqgscomposerobject.cxx"
|
||||
#include "testqgscomposerobject.moc"
|
||||
|
||||
@ -132,4 +132,4 @@ void TestQgsComposerPaper::markerLinePaper()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsComposerPaper )
|
||||
#include "moc_testqgscomposerpaper.cxx"
|
||||
#include "testqgscomposerpaper.moc"
|
||||
|
||||
@ -382,4 +382,4 @@ void TestQgsComposerPicture::pictureRemoteUrl()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsComposerPicture )
|
||||
#include "moc_testqgscomposerpicture.cxx"
|
||||
#include "testqgscomposerpicture.moc"
|
||||
|
||||
@ -224,4 +224,4 @@ void TestQgsComposerRotation::oldMapRotationApi()
|
||||
#endif
|
||||
|
||||
QTEST_MAIN( TestQgsComposerRotation )
|
||||
#include "moc_testqgscomposerrotation.cxx"
|
||||
#include "testqgscomposerrotation.moc"
|
||||
|
||||
@ -171,4 +171,4 @@ void TestQgsComposerScaleBar::tick()
|
||||
};
|
||||
|
||||
QTEST_MAIN( TestQgsComposerScaleBar )
|
||||
#include "moc_testqgscomposerscalebar.cxx"
|
||||
#include "testqgscomposerscalebar.moc"
|
||||
|
||||
@ -145,4 +145,4 @@ void TestQgsComposerShapes::symbolV2()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsComposerShapes )
|
||||
#include "moc_testqgscomposershapes.cxx"
|
||||
#include "testqgscomposershapes.moc"
|
||||
|
||||
@ -506,5 +506,5 @@ void TestQgsComposerTable::attributeTableVisibleOnly()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsComposerTable )
|
||||
#include "moc_testqgscomposertable.cxx"
|
||||
#include "testqgscomposertable.moc"
|
||||
|
||||
|
||||
@ -614,5 +614,5 @@ void TestQgsComposerTableV2::removeDuplicates()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsComposerTableV2 )
|
||||
#include "moc_testqgscomposertablev2.cxx"
|
||||
#include "testqgscomposertablev2.moc"
|
||||
|
||||
|
||||
@ -682,4 +682,4 @@ bool TestQgsComposerUtils::renderCheck( QString testName, QImage &image, int mis
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsComposerUtils )
|
||||
#include "moc_testqgscomposerutils.cxx"
|
||||
#include "testqgscomposerutils.moc"
|
||||
|
||||
@ -242,5 +242,5 @@ void TestQgsComposition::pageIsEmpty()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsComposition )
|
||||
#include "moc_testqgscomposition.cxx"
|
||||
#include "testqgscomposition.moc"
|
||||
|
||||
|
||||
@ -461,4 +461,4 @@ void TestQgsCoordinateReferenceSystem::debugPrint(
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsCoordinateReferenceSystem )
|
||||
#include "moc_testqgscoordinatereferencesystem.cxx"
|
||||
#include "testqgscoordinatereferencesystem.moc"
|
||||
|
||||
@ -62,4 +62,4 @@ void TestQgsCoordinateTransform::transformBoundingBox()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsCoordinateTransform )
|
||||
#include "moc_testqgscoordinatetransform.cxx"
|
||||
#include "testqgscoordinatetransform.moc"
|
||||
|
||||
@ -167,4 +167,4 @@ void TestQgsDataItem::testDirItemChildren()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsDataItem )
|
||||
#include "moc_testqgsdataitem.cxx"
|
||||
#include "testqgsdataitem.moc"
|
||||
|
||||
@ -173,4 +173,4 @@ class TestQgsDiagram: public QObject
|
||||
};
|
||||
|
||||
QTEST_MAIN( TestQgsDiagram )
|
||||
#include "moc_testqgsdiagram.cxx"
|
||||
#include "testqgsdiagram.moc"
|
||||
|
||||
@ -176,4 +176,4 @@ class TestQgsDiagramExpression: public QObject
|
||||
};
|
||||
|
||||
QTEST_MAIN( TestQgsDiagramExpression )
|
||||
#include "moc_testqgsdiagramexpression.cxx"
|
||||
#include "testqgsdiagramexpression.moc"
|
||||
|
||||
@ -162,7 +162,7 @@ void TestQgsDistanceArea::unit_conversions()
|
||||
};
|
||||
|
||||
QTEST_MAIN( TestQgsDistanceArea )
|
||||
#include "moc_testqgsdistancearea.cxx"
|
||||
#include "testqgsdistancearea.moc"
|
||||
|
||||
|
||||
|
||||
|
||||
@ -974,5 +974,5 @@ class TestQgsExpression: public QObject
|
||||
|
||||
QTEST_MAIN( TestQgsExpression )
|
||||
|
||||
#include "moc_testqgsexpression.cxx"
|
||||
#include "testqgsexpression.moc"
|
||||
|
||||
|
||||
@ -371,5 +371,5 @@ void TestQgsGeometry::dumpPolyline( QgsPolyline &thePolyline )
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsGeometry )
|
||||
#include "moc_testqgsgeometry.cxx"
|
||||
#include "testqgsgeometry.moc"
|
||||
|
||||
|
||||
@ -239,5 +239,5 @@ bool TestQgsGeometryImport::compareLineStrings( const QgsPolyline& polyline, QVa
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsGeometryImport )
|
||||
#include "moc_testqgsgeometryimport.cxx"
|
||||
#include "testqgsgeometryimport.moc"
|
||||
|
||||
|
||||
@ -287,4 +287,4 @@ bool TestQgsGradients::imageCheck( QString theTestType )
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsGradients )
|
||||
#include "moc_testqgsgradients.cxx"
|
||||
#include "testqgsgradients.moc"
|
||||
|
||||
@ -179,4 +179,4 @@ bool TestQgsInvertedPolygon::imageCheck( QString theTestType, const QgsRectangle
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsInvertedPolygon )
|
||||
#include "moc_testqgsinvertedpolygonrenderer.cxx"
|
||||
#include "testqgsinvertedpolygonrenderer.moc"
|
||||
|
||||
@ -251,4 +251,4 @@ void TestQgsLegendRenderer::testThreeColumns()
|
||||
|
||||
|
||||
QTEST_MAIN( TestQgsLegendRenderer )
|
||||
#include "moc_testqgslegendrenderer.cxx"
|
||||
#include "testqgslegendrenderer.moc"
|
||||
|
||||
@ -99,4 +99,4 @@ void TestQgsMapLayer::setBlendMode()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsMapLayer )
|
||||
#include "moc_testqgsmaplayer.cxx"
|
||||
#include "testqgsmaplayer.moc"
|
||||
|
||||
@ -195,6 +195,6 @@ void TestQgsMapRenderer::performanceTest()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsMapRenderer )
|
||||
#include "moc_testqgsmaprenderer.cxx"
|
||||
#include "testqgsmaprenderer.moc"
|
||||
|
||||
|
||||
|
||||
@ -157,4 +157,4 @@ void TestQgsNetworkContentFetcher::contentLoaded()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsNetworkContentFetcher )
|
||||
#include "moc_testqgsnetworkcontentfetcher.cxx"
|
||||
#include "testqgsnetworkcontentfetcher.moc"
|
||||
|
||||
@ -347,4 +347,4 @@ void TestQgsOgcUtils::testExpressionToOgcFilter_data()
|
||||
|
||||
|
||||
QTEST_MAIN( TestQgsOgcUtils )
|
||||
#include "moc_testqgsogcutils.cxx"
|
||||
#include "testqgsogcutils.moc"
|
||||
|
||||
@ -534,4 +534,4 @@ void TestQgsPoint::onSegment()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsPoint )
|
||||
#include "moc_testqgspoint.cxx"
|
||||
#include "testqgspoint.moc"
|
||||
|
||||
@ -74,4 +74,4 @@ void TestQgsProject::testReadPath()
|
||||
|
||||
|
||||
QTEST_MAIN( TestQgsProject )
|
||||
#include "moc_testqgsproject.cxx"
|
||||
#include "testqgsproject.moc"
|
||||
|
||||
@ -186,4 +186,4 @@ void TestQgsRasterFileWriter::logError( QString msg )
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsRasterFileWriter )
|
||||
#include "moc_testqgsrasterfilewriter.cxx"
|
||||
#include "testqgsrasterfilewriter.moc"
|
||||
|
||||
@ -584,4 +584,4 @@ void TestQgsRasterLayer::setRenderer()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsRasterLayer )
|
||||
#include "moc_testqgsrasterlayer.cxx"
|
||||
#include "testqgsrasterlayer.moc"
|
||||
|
||||
@ -178,4 +178,4 @@ void TestQgsRasterSubLayer::checkStats()
|
||||
|
||||
|
||||
QTEST_MAIN( TestQgsRasterSubLayer )
|
||||
#include "moc_testqgsrastersublayer.cxx"
|
||||
#include "testqgsrastersublayer.moc"
|
||||
|
||||
@ -87,7 +87,7 @@ void TestQgsRectangle::regression6194()
|
||||
};
|
||||
|
||||
QTEST_MAIN( TestQgsRectangle )
|
||||
#include "moc_testqgsrectangle.cxx"
|
||||
#include "testqgsrectangle.moc"
|
||||
|
||||
|
||||
|
||||
|
||||
@ -222,4 +222,4 @@ bool TestQgsRenderers::imageCheck( QString theTestType )
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsRenderers )
|
||||
#include "moc_testqgsrenderers.cxx"
|
||||
#include "testqgsrenderers.moc"
|
||||
|
||||
@ -145,5 +145,5 @@ class TestQgsRuleBasedRenderer: public QObject
|
||||
|
||||
QTEST_MAIN( TestQgsRuleBasedRenderer )
|
||||
|
||||
#include "moc_testqgsrulebasedrenderer.cxx"
|
||||
#include "testqgsrulebasedrenderer.moc"
|
||||
|
||||
|
||||
@ -242,4 +242,4 @@ bool TestQgsShapeburst::imageCheck( QString theTestType )
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsShapeburst )
|
||||
#include "moc_testqgsshapeburst.cxx"
|
||||
#include "testqgsshapeburst.moc"
|
||||
|
||||
@ -136,6 +136,6 @@ class TestQgsSpatialIndex : public QObject
|
||||
|
||||
QTEST_MAIN( TestQgsSpatialIndex )
|
||||
|
||||
#include "moc_testqgsspatialindex.cxx"
|
||||
#include "testqgsspatialindex.moc"
|
||||
|
||||
|
||||
|
||||
@ -428,4 +428,4 @@ void TestStyleV2::testParseColorList()
|
||||
|
||||
|
||||
QTEST_MAIN( TestStyleV2 )
|
||||
#include "moc_testqgsstylev2.cxx"
|
||||
#include "testqgsstylev2.moc"
|
||||
|
||||
@ -229,4 +229,4 @@ void TestQgsVectorDataProvider::featureAtId()
|
||||
|
||||
QTEST_MAIN( TestQgsVectorDataProvider )
|
||||
|
||||
#include "moc_testqgsvectordataprovider.cxx"
|
||||
#include "testqgsvectordataprovider.moc"
|
||||
|
||||
@ -390,5 +390,5 @@ void TestQgsVectorFileWriter::projectedPlygonGridTest()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsVectorFileWriter )
|
||||
#include "moc_testqgsvectorfilewriter.cxx"
|
||||
#include "testqgsvectorfilewriter.moc"
|
||||
|
||||
|
||||
@ -704,4 +704,4 @@ class TestQgsVectorLayer: public QObject
|
||||
};
|
||||
|
||||
QTEST_MAIN( TestQgsVectorLayer )
|
||||
#include "moc_testqgsvectorlayer.cxx"
|
||||
#include "testqgsvectorlayer.moc"
|
||||
|
||||
@ -233,5 +233,5 @@ void TestVectorLayerCache::onCommittedFeaturesAdded( QString layerId, QgsFeature
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestVectorLayerCache )
|
||||
#include "moc_testqgsvectorlayercache.cxx"
|
||||
#include "testqgsvectorlayercache.moc"
|
||||
|
||||
|
||||
@ -295,6 +295,6 @@ void TestVectorLayerJoinBuffer::testJoinSubset()
|
||||
|
||||
|
||||
QTEST_MAIN( TestVectorLayerJoinBuffer )
|
||||
#include "moc_testqgsvectorlayerjoinbuffer.cxx"
|
||||
#include "testqgsvectorlayerjoinbuffer.moc"
|
||||
|
||||
|
||||
|
||||
@ -538,4 +538,4 @@ void TestZipLayer::testZipItemVRT()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestZipLayer )
|
||||
#include "moc_testziplayer.cxx"
|
||||
#include "testziplayer.moc"
|
||||
|
||||
@ -84,10 +84,8 @@ ENDIF (APPLE)
|
||||
MACRO (ADD_QGIS_TEST testname testsrc)
|
||||
SET(qgis_${testname}_SRCS ${testsrc} ${util_SRCS})
|
||||
SET(qgis_${testname}_MOC_CPPS ${testsrc})
|
||||
QT4_WRAP_CPP(qgis_${testname}_MOC_SRCS ${qgis_${testname}_MOC_CPPS})
|
||||
ADD_CUSTOM_TARGET(qgis_${testname}moc ALL DEPENDS ${qgis_${testname}_MOC_SRCS})
|
||||
ADD_EXECUTABLE(qgis_${testname} ${qgis_${testname}_SRCS})
|
||||
ADD_DEPENDENCIES(qgis_${testname} qgis_${testname}moc)
|
||||
SET_TARGET_PROPERTIES(qgis_${testname} PROPERTIES AUTOMOC TRUE)
|
||||
TARGET_LINK_LIBRARIES(qgis_${testname}
|
||||
${QT_QTXML_LIBRARY}
|
||||
${QT_QTCORE_LIBRARY}
|
||||
|
||||
@ -102,4 +102,4 @@ void TestProjectionIssues::issue5895()
|
||||
};
|
||||
|
||||
QTEST_MAIN( TestProjectionIssues )
|
||||
#include "moc_testprojectionissues.cxx"
|
||||
#include "testprojectionissues.moc"
|
||||
|
||||
@ -94,7 +94,7 @@ void TestQgsDualView::testSelectAll()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsDualView )
|
||||
#include "moc_testqgsdualview.cxx"
|
||||
#include "testqgsdualview.moc"
|
||||
|
||||
|
||||
|
||||
|
||||
@ -91,4 +91,4 @@ void TestQgsMapCanvas::testMapRendererInteraction()
|
||||
|
||||
|
||||
QTEST_MAIN( TestQgsMapCanvas )
|
||||
#include "moc_testqgsmapcanvas.cxx"
|
||||
#include "testqgsmapcanvas.moc"
|
||||
|
||||
@ -86,7 +86,7 @@ void TestQgsMapToolZoom::zeroDragArea()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsMapToolZoom )
|
||||
#include "moc_testqgsmaptoolzoom.cxx"
|
||||
#include "testqgsmaptoolzoom.moc"
|
||||
|
||||
|
||||
|
||||
|
||||
@ -169,5 +169,5 @@ bool TestQgsQuickPrint::imageCheck( QString theTestType )
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsQuickPrint )
|
||||
#include "moc_testqgsquickprint.cxx"
|
||||
#include "testqgsquickprint.moc"
|
||||
|
||||
|
||||
@ -293,4 +293,4 @@ int TestRasterHistogram::testFile( QString theTestType,
|
||||
|
||||
|
||||
QTEST_MAIN( TestRasterHistogram )
|
||||
#include "moc_testqgsrasterhistogram.cxx"
|
||||
#include "testqgsrasterhistogram.moc"
|
||||
|
||||
@ -98,7 +98,7 @@ void TestQgsRubberband::testAddSingleMultiGeometries()
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsRubberband )
|
||||
#include "moc_testqgsrubberband.cxx"
|
||||
#include "testqgsrubberband.moc"
|
||||
|
||||
|
||||
|
||||
|
||||
@ -130,4 +130,4 @@ void TestQgsScaleComboBox::cleanup()
|
||||
};
|
||||
|
||||
QTEST_MAIN( TestQgsScaleComboBox )
|
||||
#include "moc_testqgsscalecombobox.cxx"
|
||||
#include "testqgsscalecombobox.moc"
|
||||
|
||||
@ -55,11 +55,9 @@ ENDIF (APPLE)
|
||||
|
||||
MACRO (ADD_QGIS_TEST testname testsrc)
|
||||
SET(qgis_${testname}_SRCS ${testsrc} ${util_SRCS})
|
||||
SET(qgis_${testname}_MOC_CPPS ${testsrc})
|
||||
QT4_WRAP_CPP(qgis_${testname}_MOC_SRCS ${qgis_${testname}_MOC_CPPS})
|
||||
ADD_CUSTOM_TARGET(qgis_${testname}moc ALL DEPENDS ${qgis_${testname}_MOC_SRCS})
|
||||
ADD_EXECUTABLE(qgis_${testname} ${qgis_${testname}_SRCS})
|
||||
ADD_DEPENDENCIES(qgis_${testname} qgis_${testname}moc)
|
||||
SET_TARGET_PROPERTIES(qgis_${testname} PROPERTIES AUTOMOC TRUE)
|
||||
TARGET_LINK_LIBRARIES(qgis_${testname}
|
||||
${QT_QTXML_LIBRARY}
|
||||
${QT_QTCORE_LIBRARY}
|
||||
|
||||
@ -160,4 +160,4 @@ bool TestQgsWcsProvider::read( QString theIdentifier, QString theWcsUri, QString
|
||||
}
|
||||
|
||||
QTEST_MAIN( TestQgsWcsProvider )
|
||||
#include "moc_testqgswcsprovider.cxx"
|
||||
#include "testqgswcsprovider.moc"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user