[QGIS Commit] [qgis/Quantum-GIS] 17f565: sip generation issue fix #7752 for android

GitHub noreply at github.com
Mon Sep 9 17:57:30 PDT 2013


  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 17f565a857d0580b9abe573218c18a0694832887
      https://github.com/qgis/Quantum-GIS/commit/17f565a857d0580b9abe573218c18a0694832887
  Author: Marco Bernasocchi <marco at opengis.ch>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M python/CMakeLists.txt
    M python/core/qgsapplication.sip
    M src/core/qgsapplication.h

  Log Message:
  -----------
  sip generation issue fix 	#7752 for android


  Commit: 7bc40eb65d9fd064969541aabaab8b3ca4a77106
      https://github.com/qgis/Quantum-GIS/commit/7bc40eb65d9fd064969541aabaab8b3ca4a77106
  Author: Marco Bernasocchi <marco at opengis.ch>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M python/core/gps/qgsqtlocationconnection.sip
    M src/core/gps/qgsqtlocationconnection.h

  Log Message:
  -----------
  workaround for issue #7859


  Commit: 10fc68119c14d1333f089cc5efa96b58110003d6
      https://github.com/qgis/Quantum-GIS/commit/10fc68119c14d1333f089cc5efa96b58110003d6
  Author: Marco Bernasocchi <marco at opengis.ch>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M python/core/gps/qgsqtlocationconnection.sip

  Log Message:
  -----------
  less invasive workaround for #7859


  Commit: 2cc684793ceb29d8600d71564fb38f92c998f588
      https://github.com/qgis/Quantum-GIS/commit/2cc684793ceb29d8600d71564fb38f92c998f588
  Author: Marco Bernasocchi <marco at opengis.ch>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M python/core/composer/qgscomposerscalebar.sip
    M python/core/qgsclipper.sip

  Log Message:
  -----------
  worcarounds to make sip generation work on android


  Commit: 19422390491b9599b2153268bb7ecbd9fd47ee14
      https://github.com/qgis/Quantum-GIS/commit/19422390491b9599b2153268bb7ecbd9fd47ee14
  Author: Larry Shaffer <larrys at dakotacarto.com>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M CMakeLists.txt
    M cmake/FindQtMobility.cmake

  Log Message:
  -----------
  [Android] Change order of finding QtMobility package so Qt isn't 'found' twice


  Commit: 71558e697e62c4c2d938e684b303eb1182d9b516
      https://github.com/qgis/Quantum-GIS/commit/71558e697e62c4c2d938e684b303eb1182d9b516
  Author: Larry Shaffer <larrys at dakotacarto.com>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M cmake/FindQtMobility.cmake

  Log Message:
  -----------
  [Android] Update library path


  Commit: 6ef5829abf0e5b6cc21a689bbced33a919e16178
      https://github.com/qgis/Quantum-GIS/commit/6ef5829abf0e5b6cc21a689bbced33a919e16178
  Author: Larry Shaffer <larrys at dakotacarto.com>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M src/app/main.cpp

  Log Message:
  -----------
  [Android] Fix for Qt Ministro hiding app's menubar in favor of native Android menus

- Brings back main window menu bar


  Commit: 95a89d29a01e57a65b8b305996cc8f44c0e94f34
      https://github.com/qgis/Quantum-GIS/commit/95a89d29a01e57a65b8b305996cc8f44c0e94f34
  Author: Larry Shaffer <larrys at dakotacarto.com>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M src/app/composer/qgscomposer.cpp

  Log Message:
  -----------
  [Android] Fix for Qt Ministro hiding app's menubar in favor of native Android menus

- Brings back composer window menu bar


  Commit: d1ec3f420bcab72e4867ad06048dfc062ba7c58f
      https://github.com/qgis/Quantum-GIS/commit/d1ec3f420bcab72e4867ad06048dfc062ba7c58f
  Author: Marco Bernasocchi <marco at opengis.ch>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M src/gui/qgsmessagelogviewer.cpp

  Log Message:
  -----------
  Removed tooltip that shows how many messages are logged on android.
This tooltip was rendered as a fullscreen yellow widget in android.


  Commit: e87f79d480d0c14679c9ae7ae032a27bc489b676
      https://github.com/qgis/Quantum-GIS/commit/e87f79d480d0c14679c9ae7ae032a27bc489b676
  Author: Marco Bernasocchi <marco at opengis.ch>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M src/app/qgisapp.cpp
    M src/app/qgisapp.h

  Log Message:
  -----------
  added confirm quit for android


  Commit: e703bdf08c59d04ed5ea733dbd1a9c576b7ce58f
      https://github.com/qgis/Quantum-GIS/commit/e703bdf08c59d04ed5ea733dbd1a9c576b7ce58f
  Author: Marco Bernasocchi <marco at opengis.ch>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M src/core/qgsapplication.cpp

  Log Message:
  -----------
  set correct prefixPath()


  Commit: b61b5b0f8345d04b60e4c107aa4019f74faa4bed
      https://github.com/qgis/Quantum-GIS/commit/b61b5b0f8345d04b60e4c107aa4019f74faa4bed
  Author: Marco Bernasocchi <marco at opengis.ch>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M cmake/FindPythonLibrary.cmake

  Log Message:
  -----------
  make honoring -DPYTHON_LIBRARY more solid.
as cmake --help-module FindPythonLibs states
If you'd like to specify the installation of Python to use, you should modify the following cache variables:
    PYTHON_LIBRARY             - path to the python library
   PYTHON_INCLUDE_PATH         - path to where Python.h is found

(please note it is PYTHON_INCLUDE_PATH  (deprecated) and not PYTHON_INCLUDE_DIR (new in 2.8) since we require cmake >= 2.6.2)


  Commit: bb002ee1a82a8a783015026c20efb4cc8079802f
      https://github.com/qgis/Quantum-GIS/commit/bb002ee1a82a8a783015026c20efb4cc8079802f
  Author: Larry Shaffer <larrys at dakotacarto.com>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M CMakeLists.txt
    M cmake/FindPythonLibrary.cmake
    M cmake/FindQtMobility.cmake
    M python/CMakeLists.txt
    M python/core/composer/qgscomposerscalebar.sip
    M python/core/gps/qgsqtlocationconnection.sip
    M python/core/qgsapplication.sip
    M python/core/qgsclipper.sip
    M src/app/composer/qgscomposer.cpp
    M src/app/main.cpp
    M src/app/qgisapp.cpp
    M src/app/qgisapp.h
    M src/core/gps/qgsqtlocationconnection.h
    M src/core/qgsapplication.cpp
    M src/core/qgsapplication.h
    M src/gui/qgsmessagelogviewer.cpp

  Log Message:
  -----------
  Merge pull request #881 from mbernasocchi/android

Various android updates from mbernasocchi


Compare: https://github.com/qgis/Quantum-GIS/compare/5f61dd12feaf...bb002ee1a82a


More information about the QGIS-commit mailing list