[QGIS Commit] [qgis/Quantum-GIS] 0cfe09: move HAVE_TOUCH to qgsconfig.h - fixes vtable of Q...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 0cfe094aca3452e071c9177efc6e0c4266201212
      https://github.com/qgis/Quantum-GIS/commit/0cfe094aca3452e071c9177efc6e0c4266201212
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

  Changed paths:
    M CMakeLists.txt
    M cmake_templates/qgsconfig.h.in
    M src/app/qgisapp.cpp
    M src/app/qgisapp.h
    M src/gui/qgsmapcanvas.h
    M src/gui/qgsmaptool.h

  Log Message:
  -----------
  move HAVE_TOUCH to qgsconfig.h - fixes vtable of QgsMapCanvas/QgsMapTool for plugins


  Commit: aea41eebbc7b4667b7905aff093481698cdf0e73
      https://github.com/qgis/Quantum-GIS/commit/aea41eebbc7b4667b7905aff093481698cdf0e73
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

  Changed paths:
    M python/core/qgscomposition.sip
    M src/app/composer/qgscomposer.cpp
    M src/app/composer/qgscomposer.h
    M src/app/composer/qgscompositionwidget.cpp
    M src/app/composer/qgscompositionwidget.h
    M src/app/qgisapp.cpp
    M src/app/qgisapp.h
    M src/app/qgsoptions.cpp
    M src/app/qgsoptions.h
    M src/app/qgsprojectproperties.cpp
    M src/app/qgsprojectproperties.h
    M src/core/composer/qgscomposition.cpp
    M src/core/composer/qgscomposition.h
    M src/core/qgsvectorlayer.cpp
    M src/core/symbology-ng/qgssymbolv2.cpp
    M src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
    M src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
    M src/ui/qgisapp.ui
    M src/ui/qgscompositionwidgetbase.ui
    M src/ui/qgsoptionsbase.ui
    M src/ui/qgsprojectpropertiesbase.ui
    M tests/src/gui/testqgsrasterhistogram.cpp

  Log Message:
  -----------
  Merge branch 'master' of github.com:qgis/Quantum-GIS


Compare: https://github.com/qgis/Quantum-GIS/compare/74021a477e01...aea41eebbc7b