Merge pull request #2614 from SebDieBln/UpdateCachedProjectEmbedLayers

jef-n · jef-n · commit a2a1c374de0f · 2015-12-26T15:18:33.000+01:00
Re-Read the cached project file when its contents have changed
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -1667,9 +1667,12 @@ bool QgsProject::createEmbeddedLayer( const QString &layerId, const QString &pro
   QgsDebugCall;
 
   static QString prevProjectFilePath;
+  static QDateTime prevProjectFileTimestamp;
   static QDomDocument projectDocument;
 
-  if ( projectFilePath != prevProjectFilePath )
+  QDateTime projectFileTimestamp = QFileInfo( projectFilePath ).lastModified();
+
+  if ( projectFilePath != prevProjectFilePath || projectFileTimestamp != prevProjectFileTimestamp )
   {
     prevProjectFilePath.clear();
 
@@ -1685,6 +1688,7 @@ bool QgsProject::createEmbeddedLayer( const QString &layerId, const QString &pro
     }
 
     prevProjectFilePath = projectFilePath;
+    prevProjectFileTimestamp = projectFileTimestamp;
   }
 
   // does project store pathes absolute or relative?

Original file line number	Diff line number	Diff line change
`@@ -1667,9 +1667,12 @@ bool QgsProject::createEmbeddedLayer( const QString &layerId, const QString &pro`
`1667`	`1667`	`QgsDebugCall;`
`1668`	`1668`
`1669`	`1669`	`static QString prevProjectFilePath;`
	`1670`	`+ static QDateTime prevProjectFileTimestamp;`
`1670`	`1671`	`static QDomDocument projectDocument;`
`1671`	`1672`
`1672`		`- if ( projectFilePath != prevProjectFilePath )`
	`1673`	`+ QDateTime projectFileTimestamp = QFileInfo( projectFilePath ).lastModified();`
	`1674`	`+`
	`1675`	`+ if ( projectFilePath != prevProjectFilePath \|\| projectFileTimestamp != prevProjectFileTimestamp )`
`1673`	`1676`	`{`
`1674`	`1677`	`prevProjectFilePath.clear();`
`1675`	`1678`
`@@ -1685,6 +1688,7 @@ bool QgsProject::createEmbeddedLayer( const QString &layerId, const QString &pro`
`1685`	`1688`	`}`
`1686`	`1689`
`1687`	`1690`	`prevProjectFilePath = projectFilePath;`
	`1691`	`+ prevProjectFileTimestamp = projectFileTimestamp;`
`1688`	`1692`	`}`
`1689`	`1693`
`1690`	`1694`	`// does project store pathes absolute or relative?`