[Marble-devel] Review Request 122731: Support qt4/qt5 parallel-instalable libmarblewidget

[Rex Dieter]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/122731/
-----------------------------------------------------------

(Updated April 3, 2015, 9:21 a.m.)


Status
------

This change has been marked as submitted.


Review request for Marble.


Changes
-------

Submitted with commit ac91cf9f27c355754fd7e8c6df9256a753cb8545 by Dennis Nienhüser on behalf of Rex Dieter to branch master.


Repository: marble


Description
-------

Support qt4/qt5 parallel-installabie libmarblewidget.  Current mplementation preserves compatibility with qt4 builds, and qt5 builds changes base library soname to be libmarblewidget-qt5 instead.


Diffs
-----

  CMakeLists.txt ace9a51 
  FindMarble.cmake 99f017a 
  FindMarble.cmake.in PRE-CREATION 
  MarbleMacros.cmake b86481f 
  src/apps/marble-kde/CMakeLists.txt 384f867 
  src/apps/marble-mobile/CMakeLists.txt b86cac1 
  src/apps/marble-qt/CMakeLists.txt 75b465e 
  src/apps/marble-touch/CMakeLists.txt 1d37cd4 
  src/apps/marble-ui/CMakeLists.txt 74f1849 
  src/bindings/python/CMakeLists.txt 57683cb 
  src/lib/marble/CMakeLists.txt 6c65015 
  src/plasmarunner/CMakeLists.txt b52cc35 
  src/plasmoid/CMakeLists.txt 03e251c 
  src/plugins/designer/latloneditwidget/CMakeLists.txt eb5d543 
  src/plugins/runner/gpx/CMakeLists.txt aed6f83 
  src/thumbnailer/CMakeLists.txt 175b5fc 

Diff: https://git.reviewboard.kde.org/r/122731/diff/


Testing
-------

Marble and subsurface (a qt5 app that uses libmarblewidget) builds and runs... mostly (there seems to be some problem with loading marble plugins though)


Thanks,

Rex Dieter

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/marble-devel/attachments/20150403/d5b30eb8/attachment-0001.html>