[QGIS Commit] [qgis/Quantum-GIS] 87ca65: Fix #7134

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 87ca653e8987069950bd9e65bdb9666c8daacf1c
      https://github.com/qgis/Quantum-GIS/commit/87ca653e8987069950bd9e65bdb9666c8daacf1c
  Author: Nathan Woodrow <nathan.woodrow at mapsolutions.com.au>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M src/app/qgisapp.cpp
    M src/app/qgslabelinggui.cpp
    M src/app/qgslabelinggui.h
    M src/app/qgsvectorlayerproperties.cpp
    M src/app/qgsvectorlayerproperties.h
    M src/core/qgsmaplayer.cpp
    M src/core/qgsvectorlayer.cpp

  Log Message:
  -----------
  Fix #7134


  Commit: 4e95496a0c5a2af1f940240623d6e1c8232011fd
      https://github.com/qgis/Quantum-GIS/commit/4e95496a0c5a2af1f940240623d6e1c8232011fd
  Author: Larry Shaffer <larrys at dakotacarto.com>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M src/app/qgslabelinggui.cpp
    M src/app/qgslabelinggui.h
    M src/core/qgsmaplayer.cpp

  Log Message:
  -----------
  Followup to fix for #7134, label settings not saved in .qml

- Ensure labeling gui is restored in correct order
- Run style script on qgsmaplayer.cpp


Compare: https://github.com/qgis/Quantum-GIS/compare/e0406e738a68...4e95496a0c5a