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

also handle qgz like qgs on the command line (fixes #19333; followup d66d1eec1b)

Browse Source
This commit is contained in:
Juergen E. Fischer 2018-07-04 14:05:47 +02:00
parent 6d751dcb70
commit 74d58440a7
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/main.cpp
View File

@ -746,11 +746,12 @@ int main( int argc, char *argv[] )
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
if ( sProjectFileName.isEmpty() ) if ( sProjectFileName.isEmpty() )
{ {
// check for a .qgs // check for a .qgs/z
for ( int i = 0; i < args.size(); i++ ) for ( int i = 0; i < args.size(); i++ )
{ {
QString arg = QDir::toNativeSeparators( QFileInfo( args[i] ).absoluteFilePath() ); QString arg = QDir::toNativeSeparators( QFileInfo( args[i] ).absoluteFilePath() );
if ( arg.endsWith( QLatin1String( ".qgs" ), Qt::CaseInsensitive ) ) if ( arg.endsWith( QLatin1String( ".qgs" ), Qt::CaseInsensitive ) ||
arg.endsWith( QLatin1String( ".qgz" ), Qt::CaseInsensitive ) )
{ {
sProjectFileName = arg; sProjectFileName = arg;
break; break;
@ -1288,8 +1289,9 @@ int main( int argc, char *argv[] )
{ {
QgsDebugMsg( QString( "Trying to load file : %1" ).arg( layerName ) ); QgsDebugMsg( QString( "Trying to load file : %1" ).arg( layerName ) );
// don't load anything with a .qgs extension - these are project files // don't load anything with a .qgs extension - these are project files
if ( !layerName.endsWith( QLatin1String( ".qgs" ), Qt::CaseInsensitive ) if ( !layerName.endsWith( QLatin1String( ".qgs" ), Qt::CaseInsensitive ) &&
&& !QgsZipUtils::isZipFile( layerName ) ) !layerName.endsWith( QLatin1String( ".qgz" ), Qt::CaseInsensitive ) &&
!QgsZipUtils::isZipFile( layerName ) )
{ {
qgis->openLayer( layerName ); qgis->openLayer( layerName );
} }