Datasource path are relatives in embedded qgs project

pblottiere · pblottiere · commit 8d1ee93800d6 · 2017-07-31T11:09:14.000+01:00
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -1650,7 +1650,8 @@ void QgsProject::dumpProperties() const
 QgsPathResolver QgsProject::pathResolver() const
 {
   bool absolutePaths = readBoolEntry( QStringLiteral( "Paths" ), QStringLiteral( "/Absolute" ), false );
-  return QgsPathResolver( absolutePaths ? QString() : fileName() );
+  QString baseName = mPathResolverBaseName.isEmpty() ? fileName() : mPathResolverBaseName;
+  return QgsPathResolver( absolutePaths ? QString() : baseName );
 }
 
 QString QgsProject::readPath( const QString &src ) const
@@ -2091,15 +2092,18 @@ bool QgsProject::unzip( const QString &filename )
 
   // read the project file
   mUnzipping = true;
+  mPathResolverBaseName = filename;
   if ( ! read( archive->projectFile() ) )
   {
+    mPathResolverBaseName = QString();
     mUnzipping = false;
     setError( tr( "Cannot read unzipped qgs project file" ) );
     return false;
   }
 
   // keep the archive
   mUnzipping = false;
+  mPathResolverBaseName = QString();
   mArchive.reset( archive.release() );
 
   return true;
@@ -2129,7 +2133,9 @@ bool QgsProject::zip( const QString &filename )
     const QString originalFilename = mFile.fileName();
     mFile.setFileName( qgsFile.fileName() );
 
+    mPathResolverBaseName = filename;
     writeOk = write();
+    mPathResolverBaseName = QString();
 
     mFile.setFileName( originalFilename );
     qgsFile.close();
diff --git a/src/core/qgsproject.h b/src/core/qgsproject.h
@@ -1073,6 +1073,8 @@ class CORE_EXPORT QgsProject : public QObject, public QgsExpressionContextGenera
 
     QVariantMap mCustomVariables;
 
+    QString mPathResolverBaseName;
+
     std::unique_ptr<QgsArchive> mArchive;
     bool mUnzipping;
 
