1. 31 Oct, 2015 1 commit
    • Harald Sitter's avatar
      change QT_IMPORTS_DIR to also cover false and NOTFOUND · f93278cb
      Harald Sitter authored
      if(DEFINED var) only checks if the var is defined, but with certain Finders
      var can be set but NOTFOUND.
      
      For the purposes of the if at hand we want to make sure that we have a
      *valid* QT_IMPORTS_DIR not just a set one. To that end if(var) is the
      correct instruction here as var being undefined, 0, OFF, IGNORE or NOTFOUND
      will end up as a false condition making sure that we only set
      MARBLE_QT_IMPORTS_DIR to the value of QT_IMPORTS_DIR iff it is a truthy
      value.
      
      REVIEW: 125880
      f93278cb
  2. 25 Oct, 2015 1 commit
  3. 22 Oct, 2015 1 commit
  4. 11 Oct, 2015 2 commits
  5. 30 Jul, 2015 1 commit
  6. 24 Jul, 2015 1 commit
  7. 18 Jul, 2015 1 commit
  8. 12 Jul, 2015 1 commit
  9. 01 Jun, 2015 1 commit
    • Dennis Nienhüser's avatar
      Port to KDE Frameworks 5. · cf115885
      Dennis Nienhüser authored
      Squashed commit of the kde-frameworks-5 branch, which consisted of
      commit 5f8db001 (message repeated below) and some other minor ones.
      
      Affects apps/marble-kde, bindings (not tested), doc, plasmarunner,
      plasmoid (deactivated as ktimezonewidget is now gone), thumbcreator.
      
      Also cleans up cmake files: The QTONLY options is gone completely.
      KDE parts are only included where necessary, most notably not in
      src/lib. Since users might still pass it, QTONLY=TRUE is forwarded
      to WITH_KF5=FALSE which matches the old behavior most closely. The new
      behavior is better by default however, not erroring out if KF5 is
      missing, but instead building Qt parts only.
      Additionally the QT5BUILD option is sanitized to behave as originally
      planned: You don't have to pass it anymore when both Qt4 and Qt5 are
      installed, but cmake figures out which of the two to use and the other
      one is disabled (does not interfere anymore).
      
      Compiles without warnings (aside automoc) and without kde4support
      libraries. I'm pretty sure however that I broke some parts at runtime
      for now, e.g. config saving and installation/loading of some parts.
      I18n is not tested as well. Needs to be taken care of in subsequent
      commits.
      cf115885
  10. 01 Apr, 2015 1 commit
  11. 18 Jun, 2014 1 commit
  12. 19 Jan, 2014 1 commit
  13. 18 Dec, 2013 1 commit
    • Marek Hakala's avatar
      [SoCiS 2013] Move astronomy library to marble core · c89ee28a
      Marek Hakala authored
      This patch moves astronomy related library code from the
      satellites plugin folder to src/lib/astro/. It also adds
      cmake configuration statements in order to build it as a
      separate library and link it properly to libmarblewidget.
      
      REVIEW: 113904
      c89ee28a
  14. 03 Nov, 2013 2 commits
    • Dennis Nienhüser's avatar
      Move routing_instructions to tools and provide an option to build tools · 21ffcc54
      Dennis Nienhüser authored
      Use the cmake option BUILD_MARBLE_TOOLS to enable compilation of
      tools for e.g. file format conversion. Defaults to OFF.
      21ffcc54
    • Dennis Nienhüser's avatar
      Directory structure reorganization · 1a0dbc18
      Dennis Nienhüser authored
      Moves files and directories:
      1) src/lib => src/lib/marble
      2) src/*marble-qt related* => src/apps/marble-qt
         src/*marble (KDE) related* => src/apps/marble-kde
         src/qt-components/marble-touch => src/apps/marble-touch
      
      1) is a preparation to align the structure of installed headers with
      the structure of the library sources, so that we can build tools and
      examples in the same go and detect API changes early.
      2) results in a much more tidy src/ and more intuitive location of the
      sources of the respective applications.
      
      REVIEW: 112114
      1a0dbc18
  15. 30 Oct, 2013 1 commit
    • Michael Zanetti's avatar
      Support for Qt5. · 834c04d3
      Michael Zanetti authored
      Adds support for compiling against Qt5. This affects the Marble library
      and the Marble Qt Desktop application. When compiling against Qt5,
      the Marble KDE Desktop application is not build (porting to KDE
      frameworks 5 is yet to be done).
      
      If both Qt4 and Qt5 are installed on the system, Qt4 is chosen by
      default. It can be overriden using the QT5BUILD=TRUE cmake variable.
      When building against Qt5, cmake will emit lots of
      CMAKE_AUTOMOC_RELAXED_MODE related warnings. Please ignore them.
      
      REVIEW: 113392
      FEATURE:
      
      Squashed commit of the following:
      
      commit 90286f9a
      Merge: b47483d2 2773f06a
      Author: Dennis Nienhüser <earthwings@gentoo.org>
      Date:   Wed Oct 30 18:18:27 2013 +0100
      
          Merge branch 'master' into qt5
      
      commit b47483d2
      Author: Dennis Nienhüser <earthwings@gentoo.org>
      Date:   Wed Oct 23 10:53:18 2013 +0200
      
          Have cmake set fpic option
      
          Hopefully it is smart enough to determine the correct setting based
          on operating system / compiler. Might suppress warning messages in
          windows/mingw.
      
      commit 04acc49b
      Author: Dennis Nienhüser <earthwings@gentoo.org>
      Date:   Wed Oct 23 09:07:18 2013 +0200
      
          Link against qt sql libraries
      
      commit 9a7e86de
      Author: Dennis Nienhüser <earthwings@gentoo.org>
      Date:   Sun Oct 20 19:42:44 2013 +0200
      
          Determine build flags automatically where possible.
      
          - If Qt4 is not installed, but Qt5 is, do a QT5BUILD automatically
          - If both Qt4 and Qt5 are installed, use Qt4 unless user sets QT5BUILD
          - When doing QT5BUILD, do a QTONLY build (KDE frameworks 5 support tbd)
      
      commit 6600b366
      Author: Dennis Nienhüser <earthwings@gentoo.org>
      Date:   Sun Oct 20 18:50:44 2013 +0200
      
          Reuse MARBLE_PLUGIN_INSTALL_PATH.
      
          Do not handle KDE vs Qt build specially wrt plugin install path. Also
          enables non-system installation for QTONLY=OFF width designer plugins.
      
      commit 94270cf0
      Author: Dennis Nienhüser <earthwings@gentoo.org>
      Date:   Sun Oct 20 18:50:24 2013 +0200
      
          Remove duplicate macro
      
      commit b6c66aa9
      Author: Dennis Nienhüser <earthwings@gentoo.org>
      Date:   Sun Oct 20 18:49:51 2013 +0200
      
          Support building qt designer plugins with qt5
      
      commit 43ac9240
      Author: Dennis Nienhüser <earthwings@gentoo.org>
      Date:   Sun Oct 20 17:22:16 2013 +0200
      
          Fix typo
      
      commit 2f52806b
      Author: Dennis Nienhüser <earthwings@gentoo.org>
      Date:   Sun Oct 20 17:18:25 2013 +0200
      
          Don't use NULL. Use 0.
      
      commit c75c1998
      Author: Dennis Nienhüser <earthwings@gentoo.org>
      Date:   Sun Oct 20 17:11:10 2013 +0200
      
          Fix typo
      
      commit 75c0e416
      Merge: 2788ad89 a356329a
      Author: Dennis Nienhüser <earthwings@gentoo.org>
      Date:   Sun Oct 20 17:06:30 2013 +0200
      
          Merge branch 'master' into qt5
      
      commit 2788ad89
      Author: Dennis Nienhüser <earthwings@gentoo.org>
      Date:   Sun Oct 20 14:35:20 2013 +0200
      
          Include marble_export.h for the Q_PLUGIN_METADATA definition with qt4
      
      commit 7696304f
      Author: Dennis Nienhüser <earthwings@gentoo.org>
      Date:   Sun Oct 20 14:22:22 2013 +0200
      
          Move if() clauses out of include_directories command.
      
          Not sure if newer cmake versions allow that syntax, but the statements
          end up as-is in include directory commands here (cmake 2.8.11.2) which
          confuse g++.
      
      commit f32eda23
      Author: Dennis Nienhüser <earthwings@gentoo.org>
      Date:   Sun Oct 20 14:20:18 2013 +0200
      
          Fix class name in typedef
      
      commit 90d113b9
      Author: Dennis Nienhüser <earthwings@gentoo.org>
      Date:   Sun Oct 20 14:01:11 2013 +0200
      
          Remove -qt=qt5 option which is unknown to qmake in qt 5.0 at least
      
      commit 59d45806
      Merge: fce79d75 b5acbb90
      Author: Dennis Nienhüser <earthwings@gentoo.org>
      Date:   Sun Oct 20 11:29:11 2013 +0200
      
          Merge branch 'master' into qt5
      
          Conflicts:
          	src/plugins/CMakeLists.txt
          	src/plugins/qt-components/CMakeLists.txt
          	src/plugins/qt-components/QtComponentsPlugin.h
          	src/qt-components/marble-touch/CMakeLists.txt
      
      commit fce79d75
      Author: Michael Zanetti <michael_zanetti@gmx.net>
      Date:   Sun Sep 22 21:40:01 2013 +0200
      
          fix qml components install dir for Qt5
      
      commit 82ea5526
      Author: Michael Zanetti <michael_zanetti@gmx.net>
      Date:   Tue Sep 17 22:44:55 2013 +0200
      
          make marble-touch compile with qt5
      
      commit 763837ff
      Merge: 8f8a6834 63294506
      Author: Michael Zanetti <michael_zanetti@gmx.net>
      Date:   Tue Sep 17 21:46:06 2013 +0200
      
          Merge branch 'master' into qt5
      
          Conflicts:
          	src/lib/StackedTile.cpp
      
      commit 8f8a6834
      Author: Dennis Nienhüser <earthwings@gentoo.org>
      Date:   Sun Sep 1 16:44:12 2013 +0200
      
          QtMobility only works with Qt4
      
      commit c1f8c6f6
      Author: Dennis Nienhüser <earthwings@gentoo.org>
      Date:   Sun Sep 1 16:39:52 2013 +0200
      
          Port roleNames() to Qt5
      
      commit e29cc404
      Merge: 4c9ba04b 5543d999
      Author: Dennis Nienhüser <earthwings@gentoo.org>
      Date:   Sun Sep 1 16:29:28 2013 +0200
      
          Merge branch 'master' into qt5
      
          Conflicts:
          	src/lib/NewstuffModel.h
          	src/lib/routing/SpeakersModel.h
          	src/plugins/declarative/MapThemeModel.cpp
          	src/plugins/declarative/MapThemeModel.h
      
      commit 4c9ba04b
      Author: Dennis Nienhüser <earthwings@gentoo.org>
      Date:   Fri Aug 30 20:12:30 2013 +0200
      
          Guard QT_USE_FILE include against Qt5 build. Add missing include dir.
      
      commit 77bd5705
      Author: Michael Zanetti <mzanetti@kde.org>
      Date:   Thu Aug 29 23:29:56 2013 +0200
      
          ported tests to Qt 5
      
      commit f5b7e6ac
      Author: Michael Zanetti <mzanetti@kde.org>
      Date:   Thu Aug 29 22:05:51 2013 +0200
      
          all plugins ported to Qt5 (components plugin's QML files not ported yet)
      
      commit ae390969
      Author: Michael Zanetti <mzanetti@kde.org>
      Date:   Thu Aug 29 21:54:47 2013 +0200
      
          marble-mobile ported to Qt5
      
      commit 22cd33d6
      Merge: db5fec5e eb4206dc
      Author: Michael Zanetti <mzanetti@kde.org>
      Date:   Thu Aug 29 21:38:33 2013 +0200
      
          Merge branch 'master' into qt5
      
          Conflicts:
          	MarbleMacros.cmake
          	src/CMakeLists.txt
          	src/lib/CMakeLists.txt
          	src/plugins/render/earthquake/CMakeLists.txt
          	src/plugins/render/elevationprofilefloatitem/CMakeLists.txt
          	src/plugins/render/elevationprofilemarker/CMakeLists.txt
          	src/plugins/render/navigation/CMakeLists.txt
          	src/plugins/render/opendesktop/CMakeLists.txt
      
      commit db5fec5e
      Author: Michael Zanetti <mzanetti@kde.org>
      Date:   Thu Aug 29 21:32:25 2013 +0200
      
          ported runner plugins to Qt5
      
      commit e7898acf
      Author: Michael Zanetti <mzanetti@kde.org>
      Date:   Sun Aug 25 16:26:26 2013 +0200
      
          don't use QDeclarative typedefs in headers
      
      commit 46c614fd
      Author: Dennis Nienhüser <earthwings@gentoo.org>
      Date:   Sun Aug 25 15:28:26 2013 +0200
      
          Provide Q_PLUGIN_METADATA needed for plugin loading with qt5
      
      commit 0c1a3d42
      Author: Dennis Nienhüser <earthwings@gentoo.org>
      Date:   Sun Aug 25 15:27:15 2013 +0200
      
          Phonon only works with Qt4.
      
          Including it anyway leads to linking against both qt4 and qt5 which
          results in a segfault at runtime during plugin loading.
      
      commit b457c410
      Author: Dennis Nienhüser <earthwings@gentoo.org>
      Date:   Sun Aug 25 15:09:47 2013 +0200
      
          Fix declarative plugin installation path
      
      commit 87dd04a0
      Author: Michael Zanetti <mzanetti@kde.org>
      Date:   Sun Aug 25 14:34:05 2013 +0200
      
          make new cloudsync code work with Qt5
      
      commit c15282ba
      Merge: 49c2920e 39727c59
      Author: Michael Zanetti <mzanetti@kde.org>
      Date:   Sun Aug 25 14:30:43 2013 +0200
      
          Merge branch 'master' into qt5
      
          Conflicts:
          	CMakeLists.txt
          	src/lib/AbstractDataPluginModel.cpp
          	src/lib/ServerLayout.cpp
          	src/tilecreator/CMakeLists.txt
      
      commit 49c2920e
      Author: Michael Zanetti <mzanetti@kde.org>
      Date:   Sun Aug 25 14:03:36 2013 +0200
      
          typdef QDeclarative -> QQml/QQuick as much as possible
      
      commit b48c6a90
      Author: Michael Zanetti <mzanetti@kde.org>
      Date:   Sun Aug 25 13:53:19 2013 +0200
      
          remove debug message
      
      commit 485dfc56
      Author: Michael Zanetti <mzanetti@kde.org>
      Date:   Sun Aug 25 13:51:30 2013 +0200
      
          finish porting plugins to Qt5
      
      commit aab97586
      Author: Michael Zanetti <mzanetti@kde.org>
      Date:   Wed Aug 21 23:47:40 2013 +0200
      
          compiles and runs with Qt5. Plugins and tests disabled for now.
      
      commit f5adf6ee
      Author: Michael Zanetti <mzanetti@kde.org>
      Date:   Sun Aug 4 16:26:18 2013 +0200
      
          use cmake automoc for cmake version >= 2.8 and QT5
      834c04d3
  16. 29 Aug, 2013 1 commit
  17. 27 Aug, 2013 1 commit
    • Bernhard Beschow's avatar
      factor out dedicated executable "marble-mobile" for mobile devices · e6aaf6c0
      Bernhard Beschow authored
      Having a dedicated executable for mobile devices should ease maintainance for various reasons:
      1) handling the smallscreen flag correctly is rather fragile and has lead to regressions in the past
      2) allows for deeper integration into the system w/o "smart" code (determining network state, screensaver handling, hardware zoom buttons, etc.)
      
      marble-qt looses the --smallscreen and --nosmallscreen commandline switches.
      
      REVIEW: 112242
      e6aaf6c0
  18. 01 Aug, 2013 1 commit
    • Dennis Nienhüser's avatar
      Move tilecreator to tools. Place generated srtm tiles in data. · 253ea9fe
      Dennis Nienhüser authored
      Also removes the TILES_AT_COMPILETIME cmake option.
      Previously tilecreator was compiled by cmake and then executed
      to generate tiles from srtm.jpg. The size difference between both
      is not large (3.1 MB vs 3.8 MB) so the additional complexity is
      avoided now and the generated tiles are placed in data/ directly.
      
      This does not affect the installation result in any way. Just the
      source repository grows slightly.
      
      tilecreator is now available from tools/tilecreator/ and can be
      compiled using cmake.
      253ea9fe
  19. 31 Dec, 2012 1 commit
    • Dennis Nienhüser's avatar
      Add bin/marble-qt. Please read on. · fbe6ad50
      Dennis Nienhüser authored
      Previously the cmake boolean switch QTONLY was used to build
      bin/marble as a KDE application (QTONLY=FALSE, default) or as
      a Qt application (QTONLY=TRUE, no KDE dependencies at all). This
      approach has some drawbacks:
      - it's not immediately clear which version (KDE or Qt) bin/marble is
      - you cannot build the KDE and Qt version in one go
      
      Having bin/marble and bin/marble-qt separated fixes that:
      - bin/marble-qt is the Qt version, always there.
        bin/marble is the KDE version
      - bin/marble and bin/marble-qt are both installed at the same time
        (great for testing and for distributions for packaging)
      
      Warning: For continuous builds with QTONLY=TRUE, please delete bin/marble
      now. Execute bin/marble-qt in the future.
      
      Note: Tested with QTONLY=TRUE/FALSE, but only on Linux. Please report
      any breakage you might encounter.
      
      Further reduction of QTONLY usage in cmake files should come in
      future commits. The CMAKE_INSTALL_PREFIX subfolder structure might
      change as well.
      
      CCMAIL: marble-devel@kde.org
      fbe6ad50
  20. 28 Nov, 2012 1 commit
    • Dennis Nienhüser's avatar
      Build status summary in cmake runs · b99121f6
      Dennis Nienhüser authored
      Uses the FeatureSummary module of cmake and should be
      backwards-compatible to early 2.8.x versions (maybe also 2.6?) versions
      thanks to the marble_set_package_properties macro.
      
      REVIEW: 107465
      b99121f6
  21. 10 May, 2012 1 commit
  22. 08 May, 2012 3 commits
  23. 07 May, 2012 1 commit
  24. 06 May, 2012 1 commit
  25. 18 Jan, 2012 1 commit
  26. 28 Nov, 2011 1 commit
  27. 07 Nov, 2011 1 commit
  28. 21 Oct, 2011 1 commit
    • Dennis Nienhüser's avatar
      Try harder to find the QML imports/ path. · f31cff6d
      Dennis Nienhüser authored
      Older versions of cmake ship a FindQt4.cmake check that does not setup
      QT_IMPORTS_DIR. Query its value from qmake in that case instead of
      falling back to installing in Marble's plugin path.
      f31cff6d
  29. 15 Sep, 2011 1 commit
  30. 11 Sep, 2011 2 commits
    • Dennis Nienhüser's avatar
    • Dennis Nienhüser's avatar
      Install decl. plugins in CMAKE_INSTALL_PREFIX unless /usr/local is used · a58a2cc5
      Dennis Nienhüser authored
      Declarative plugins are loaded by Qt from cwd, QLibraryInfo::ImportsPath
      and QML_IMPORT_PATH. Setting up the latter is inconvenient for users,
      so we try to avoid it:
      - When CMAKE_INSTALL_PREFIX is in line with QML_IMPORTS_PATH, be happy
      - When CMAKE_INSTALL_PREFIX is /usr/local (default), install to
      QML_IMPORTS_PATH (cmake, something like /usr/lib/qt4/imports) even if
      that is out of CMAKE_INSTALL_PREFIX and be quiet about it to avoid
      confusing people reading the compile output.
      - When CMAKE_INSTALL_PREFIX is different (e.g. in $HOME), respect it
      when installing to avoid permission problems and instruct the user to
      setup the QML_IMPORT_PATH environment variable.
      a58a2cc5
  31. 06 Sep, 2011 1 commit
  32. 09 Jul, 2011 1 commit
  33. 08 Jul, 2011 1 commit
  34. 02 Feb, 2011 1 commit
  35. 27 Jan, 2011 1 commit