[QGIS Commit] [qgis/Quantum-GIS] 913522: Add access to the atlas' layer in the expression b...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 91352265147701a7bba1cd3129d27315444a081f
      https://github.com/qgis/Quantum-GIS/commit/91352265147701a7bba1cd3129d27315444a081f
  Author: Hugo Mercier <hugo.mercier at oslandia.com>
  Date:   2012-10-06 (Sat, 06 Oct 2012)

  Changed paths:
    M python/core/composer/qgscomposition.sip
    M src/app/composer/qgsatlascompositionwidget.cpp
    M src/app/composer/qgsatlascompositionwidget.h
    M src/app/composer/qgscomposer.cpp
    M src/app/composer/qgscomposer.h
    M src/app/composer/qgscomposerlabelwidget.cpp
    M src/core/composer/qgscomposition.cpp
    M src/core/composer/qgscomposition.h

  Log Message:
  -----------
  Add access to the atlas' layer in the expression builder GUI for labels.
QgsAtlasComposition is now held by QgsComposition


  Commit: 9f0d8581756a2253b723427c5a297e7bd96ba4a3
      https://github.com/qgis/Quantum-GIS/commit/9f0d8581756a2253b723427c5a297e7bd96ba4a3
  Author: mhugent <marco.hugentobler at sourcepole.ch>
  Date:   2012-10-06 (Sat, 06 Oct 2012)

  Changed paths:
    M python/core/composer/qgscomposition.sip
    M src/app/composer/qgsatlascompositionwidget.cpp
    M src/app/composer/qgsatlascompositionwidget.h
    M src/app/composer/qgscomposer.cpp
    M src/app/composer/qgscomposer.h
    M src/app/composer/qgscomposerlabelwidget.cpp
    M src/core/composer/qgscomposition.cpp
    M src/core/composer/qgscomposition.h

  Log Message:
  -----------
  Merge pull request #274 from Oslandia/atlas_integration

Add access to the atlas layer in the expression builder GUI for labels.


Compare: https://github.com/qgis/Quantum-GIS/compare/0d4b6f6d3296...9f0d8581756a