[Marble-devel] Review Request 111769: switch from qt4_automoc to cmake automoc

Michael Zanetti mzanetti at kde.org
Sun Aug 25 12:43:12 UTC 2013


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

(Updated Aug. 25, 2013, 12:43 p.m.)


Review request for Marble.


Changes
-------

found and fixed a forgotten qt4_generate_moc in marble_add_test


Description
-------

This commit switches from qt4_automoc to cmake automoc.

This is one more step on the way to make Marble work with Qt5.


Diffs (updated)
-----

  CMakeLists.txt 69c2fbe 
  MarbleMacros.cmake 5a0aedc 
  src/CMakeLists.txt b2a3e09 
  src/lib/CMakeLists.txt 16c7fab 
  src/plugins/declarative/CMakeLists.txt 300ebed 
  src/plugins/positionprovider/geoclue/GeoCute/CMakeLists.txt abde4f2 
  src/plugins/render/aprs/CMakeLists.txt 4896a8e 
  src/plugins/render/earthquake/CMakeLists.txt 6a4704e 
  src/plugins/render/elevationprofilefloatitem/CMakeLists.txt 872e5e1 
  src/plugins/render/elevationprofilemarker/CMakeLists.txt bbe043e 
  src/plugins/render/fileview/CMakeLists.txt adfa961 
  src/plugins/render/foursquare/CMakeLists.txt 0b62efd 
  src/plugins/render/license/CMakeLists.txt 90c0097 
  src/plugins/render/navigation/CMakeLists.txt b0597aa 
  src/plugins/render/opendesktop/CMakeLists.txt 50da329 
  src/qt-components/marble-touch/CMakeLists.txt 52940a6 
  src/routing-instructions/CMakeLists.txt c1e6386 
  src/tilecreator/CMakeLists.txt f1eed44 
  tools/tilecreator-srtm2/CMakeLists.txt 8088187 

Diff: http://git.reviewboard.kde.org/r/111769/diff/


Testing
-------

Tested on Ubuntu with Qt4 and -DQTONLY=1


Thanks,

Michael Zanetti

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


More information about the Marble-devel mailing list