mirror of
https://github.com/qgis/QGIS.git
synced 2025-03-09 00:35:20 -05:00
Merge back into master
This commit is contained in:
parent
d99d829ef2
commit
4ee24bbb64
@ -368,7 +368,7 @@ QStringList QgsProcessingModelAlgorithm::asPythonCode( const QgsProcessing::Pyth
|
||||
fileDocString << QStringLiteral( "Model exported as python." );
|
||||
fileDocString << QStringLiteral( "Name : %1" ).arg( displayName() );
|
||||
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 << QString();
|
||||
|
||||
|
@ -7839,7 +7839,7 @@ void TestQgsProcessing::modelExecution()
|
||||
" return ''\n"
|
||||
"\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 );
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user