Fix failing composer map tests

nyalldawson · nyalldawson · commit 3ffeabe2aa97 · 2017-03-13T15:13:21.000+10:00
diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
@@ -1500,6 +1500,7 @@ QList<QgsMapLayer *> QgsComposerMap::layers() const
 
 void QgsComposerMap::setLayers( const QList<QgsMapLayer *> &layers )
 {
+  mKeepLayerSet = true;
   mLayers = _qgis_listRawToQPointer( layers );
 }
 
diff --git a/src/core/composer/qgscomposermap.h b/src/core/composer/qgscomposermap.h
@@ -220,16 +220,16 @@ class CORE_EXPORT QgsComposerMap : public QgsComposerItem
     void setKeepLayerSet( bool enabled ) {mKeepLayerSet = enabled;}
 
     /**
-     * Getter for stored layer set. This will usually be synchronized with the main app canvas
-     * layer set (and layer order), unless the keepLayerSet() flag is true.
+     * Getter for stored layer set. This will only be used if the
+     * keepLayerSet() flag is true.
      * @see setLayers()
      * @see keepLayerSet()
      */
     QList<QgsMapLayer *> layers() const;
 
     /**
-     * Setter for stored layer set.  This will usually be synchronized with the main app canvas
-     * layer set (and layer order), unless the keepLayerSet() flag is true.
+     * Setter for stored layer set. Calling this will automatically set
+     * keepLayerSet() to true.
      * @see layers()
      * @see keepLayerSet()
      */
diff --git a/src/gui/qgscomposerview.cpp b/src/gui/qgscomposerview.cpp
@@ -1001,7 +1001,6 @@ void QgsComposerView::mouseReleaseEvent( QMouseEvent *e )
         if ( mCanvas )
         {
           composerMap->zoomToExtent( mCanvas->mapSettings().visibleExtent() );
-          composerMap->setLayers( mCanvas->mapSettings().layers() );
         }
 
         composition()->addComposerMap( composerMap );

Original file line number	Diff line number	Diff line change
`@@ -1500,6 +1500,7 @@ QList<QgsMapLayer *> QgsComposerMap::layers() const`
`1500`	`1500`
`1501`	`1501`	`void QgsComposerMap::setLayers( const QList<QgsMapLayer *> &layers )`
`1502`	`1502`	`{`
	`1503`	`+ mKeepLayerSet = true;`
`1503`	`1504`	`mLayers = _qgis_listRawToQPointer( layers );`
`1504`	`1505`	`}`
`1505`	`1506`
Original file line number	Diff line number	Diff line change
`@@ -1001,7 +1001,6 @@ void QgsComposerView::mouseReleaseEvent( QMouseEvent *e )`
`1001`	`1001`	`if ( mCanvas )`
`1002`	`1002`	`{`
`1003`	`1003`	`composerMap->zoomToExtent( mCanvas->mapSettings().visibleExtent() );`
`1004`		`- composerMap->setLayers( mCanvas->mapSettings().layers() );`
`1005`	`1004`	`}`
`1006`	`1005`
`1007`	`1006`	`composition()->addComposerMap( composerMap );`