sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-10 00:13:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge back into master

Browse Source
This commit is contained in:
Matthias Kuhn 2019-11-02 15:02:55 +01:00
parent d99d829ef2
commit 4ee24bbb64
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/processing/models/qgsprocessingmodelalgorithm.cpp
View File

@ -368,7 +368,7 @@ QStringList QgsProcessingModelAlgorithm::asPythonCode( const QgsProcessing::Pyth
fileDocString << QStringLiteral( "Model exported as python." ); fileDocString << QStringLiteral( "Model exported as python." );
fileDocString << QStringLiteral( "Name : %1" ).arg( displayName() ); fileDocString << QStringLiteral( "Name : %1" ).arg( displayName() );
fileDocString << QStringLiteral( "Group : %1" ).arg( group() ); fileDocString << QStringLiteral( "Group : %1" ).arg( group() );
fileDocString << QStringLiteral( "With QGIS : %1" ).arg( Qgis::QGIS_VERSION_INT ); fileDocString << QStringLiteral( "With QGIS : %1" ).arg( Qgis::versionInt() );
fileDocString << QStringLiteral( "\"\"\"" ); fileDocString << QStringLiteral( "\"\"\"" );
fileDocString << QString(); fileDocString << QString();

2
tests/src/analysis/testqgsprocessing.cpp
View File

@ -7839,7 +7839,7 @@ void TestQgsProcessing::modelExecution()
" return ''\n" " return ''\n"
"\n" "\n"
" def createInstance(self):\n" " def createInstance(self):\n"
" return MyModel()\n" ).arg( Qgis::QGIS_VERSION_INT ).split( '\n' ); " return MyModel()\n" ).arg( Qgis::versionInt() ).split( '\n' );
QCOMPARE( actualParts, expectedParts ); QCOMPARE( actualParts, expectedParts );
} }