[-]
[+]
|
Changed |
marble.spec
|
|
[-]
[+]
|
Deleted |
marble-1.14.21_sfos_160421.tar.xz/src/lib/astro/astrolib_export.h
^
|
@@ -1,26 +0,0 @@
-//
-// This file is part of the Marble Virtual Globe.
-//
-// This program is free software licensed under the GNU LGPL. You can
-// find a copy of this license in LICENSE.txt in the top directory of
-// the source code.
-//
-// Copyright 2013 Marek Hakala <hakala.marek@gmail.com>
-//
-
-#ifndef ASTROLIB_EXPORT_H
-#define ASTROLIB_EXPORT_H
-
-#define QT_NO_VERSION_TAGGING 1
-
-#include <QtGlobal>
-
-#ifndef ASTROLIB_EXPORT
-# ifdef MAKE_ASTRO_LIB
-# define ASTROLIB_EXPORT Q_DECL_EXPORT
-# else
-# define ASTROLIB_EXPORT Q_DECL_IMPORT
-# endif
-#endif
-
-#endif // ASTROLIB_EXPORT_H
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/CMakeLists.txt
^
|
@@ -45,6 +45,7 @@
)
# add cmake macros
+include(GenerateExportHeader)
include( MarbleMacros )
####################################################
@@ -107,14 +108,6 @@
set(MARBLEWIDGET marblewidget-qt5)
-include_directories( ${Qt5Svg_INCLUDE_DIRS} )
-include_directories( ${Qt5PrintSupport_INCLUDE_DIRS} )
-include_directories( ${Qt5Network_INCLUDE_DIRS} )
-include_directories( ${Qt5Script_INCLUDE_DIRS} )
-include_directories( ${Qt5Test_INCLUDE_DIRS} )
-include_directories( ${Qt5Xml_INCLUDE_DIRS} )
-include_directories( ${Qt5Sql_INCLUDE_DIRS} )
-
SET(CMAKE_AUTOMOC TRUE)
# Use M_PI under Windows
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/MarbleMacros.cmake
^
|
@@ -85,8 +85,7 @@
add_executable( ${TEST_NAME} ${${TEST_NAME}_SRCS} )
target_link_libraries( ${TEST_NAME} ${MARBLEWIDGET} )
- target_link_libraries( ${TEST_NAME} ${Qt5Test_LIBRARIES}
- ${Qt5DBus_LIBRARIES} )
+ target_link_libraries( ${TEST_NAME} Qt5::Test )
set_target_properties( ${TEST_NAME} PROPERTIES
COMPILE_FLAGS "-DDATA_PATH=\"\\\"${DATA_PATH}\\\"\" -DPLUGIN_PATH=\"\\\"${PLUGIN_PATH}\\\"\"" )
|
|
Added |
marble-1.14.21_sfos_160424.tar.xz/data/android/drawable-xxxhdpi/behaimlogo.png
^
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/data/lang/CMakeLists.txt
^
|
@@ -9,7 +9,7 @@
set( ${TARGET}_SRC merge_ts_po.cpp )
add_executable( ${TARGET} ${${TARGET}_SRC} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} )
+target_link_libraries( ${TARGET} Qt5::Core )
# MARBLE_WRAP_PO(qmfiles pofile1 pofile2 ... )
MACRO(MARBLE_WRAP_PO qmfiles)
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/examples/cpp/animation-video/CMakeLists.txt
^
|
@@ -10,6 +10,5 @@
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} ${OpenCV_LIBS} ${MARBLEWIDGET} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} )
install( TARGETS ${TARGET} RUNTIME DESTINATION bin )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/examples/cpp/basic-routing/CMakeLists.txt
^
|
@@ -10,7 +10,6 @@
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} )
install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
install( FILES ${${TARGET}_SRC} Readme.txt DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/examples/cpp/custom-layers/CMakeLists.txt
^
|
@@ -10,7 +10,6 @@
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} )
install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
install( FILES ${${TARGET}_SRC} Readme.txt DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/examples/cpp/geopainter/CMakeLists.txt
^
|
@@ -10,7 +10,6 @@
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} )
install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
install( FILES ${${TARGET}_SRC} Readme.txt DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/examples/cpp/hello-marble/CMakeLists.txt
^
|
@@ -10,7 +10,6 @@
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} )
install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
install( FILES ${${TARGET}_SRC} Readme.txt DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/examples/cpp/kml-inspector/CMakeLists.txt
^
|
@@ -10,7 +10,6 @@
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} )
install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
install( FILES ${${TARGET}_SRC} Readme.txt DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/examples/cpp/kml-screenshot/CMakeLists.txt
^
|
@@ -10,6 +10,5 @@
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} )
install( TARGETS ${TARGET} RUNTIME DESTINATION bin )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/examples/cpp/map-controls/CMakeLists.txt
^
|
@@ -10,7 +10,6 @@
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} )
install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
install( FILES ${${TARGET}_SRC} Readme.txt DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/examples/cpp/map-properties/CMakeLists.txt
^
|
@@ -10,7 +10,6 @@
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} )
install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
install( FILES ${${TARGET}_SRC} Readme.txt DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/examples/cpp/marble-game/CMakeLists.txt
^
|
@@ -27,8 +27,6 @@
${MARBLEWIDGET}
marbleui)
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} )
-
install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
install( FILES ${${TARGET}_SRCS} DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
install( FILES CMakeLists.txt.external DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} RENAME CMakeLists.txt )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/examples/cpp/marbleQuick2/CMakeLists.txt
^
|
@@ -12,7 +12,6 @@
add_executable( ${TARGET} ${${TARGET}_SRC} ${marble_QRCS} )
target_link_libraries( ${TARGET} ${OpenCV_LIBRARIES} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES} ${Qt5Widget_LIBRARIES} )
target_link_libraries( ${TARGET} ${MARBLEWIDGET} marbledeclarative )
add_custom_command(TARGET ${TARGET} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/examples/cpp/overlay-rendering/CMakeLists.txt
^
|
@@ -10,7 +10,6 @@
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} )
install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
install( FILES ${${TARGET}_SRC} Readme.txt DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/examples/cpp/pie-charts/CMakeLists.txt
^
|
@@ -10,6 +10,5 @@
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} )
install( TARGETS ${TARGET} RUNTIME DESTINATION bin )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/examples/cpp/reverse-geocoding/CMakeLists.txt
^
|
@@ -10,7 +10,6 @@
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} )
install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
install( FILES ${${TARGET}_SRC} Readme.txt DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/examples/cpp/route-image/CMakeLists.txt
^
|
@@ -10,6 +10,5 @@
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} )
install( TARGETS ${TARGET} RUNTIME DESTINATION bin )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/examples/cpp/search/CMakeLists.txt
^
|
@@ -10,7 +10,6 @@
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} )
install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
install( FILES ${${TARGET}_SRC} Readme.txt DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/examples/cpp/squad-interpolation/CMakeLists.txt
^
|
@@ -10,7 +10,6 @@
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} )
install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
install( FILES ${${TARGET}_SRC} DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/examples/cpp/tour-preview/CMakeLists.txt
^
|
@@ -10,6 +10,5 @@
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} ${OpenCV_LIBS} ${MARBLEWIDGET} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} )
install( TARGETS ${TARGET} RUNTIME DESTINATION bin )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/examples/cpp/vehicletracking/CMakeLists.txt
^
|
@@ -10,7 +10,6 @@
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} ${MARBLEWIDGET} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} )
install( TARGETS ${TARGET} RUNTIME DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
install( FILES ${${TARGET}_SRC} DESTINATION ${MARBLE_EXAMPLES_INSTALL_DIR}/${TARGET} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/apps/behaim/CMakeLists.txt
^
|
@@ -7,31 +7,36 @@
set(TARGET MarbleBehaim)
find_package(Qt5AndroidExtras)
- include_directories(${Qt5AndroidExtras_INCLUDE_DIRS})
add_library (${TARGET} SHARED ${marble_SRCS} ${marble_QRCS})
+
+ # while not directly linked, need to be listed here to have deployqt pick up those libs
+ target_link_libraries (
+ ${TARGET}
+ ${MARBLEWIDGET}
+ astro
+ Qt5::Concurrent
+ Qt5::Xml
+ Qt5::Widgets
+ Qt5::PrintSupport
+ Qt5::Network
+ Qt5::Script
+ Qt5::Sql
+ Qt5::Svg
+ Qt5::Location
+ Qt5::Positioning
+ Qt5::AndroidExtras
+ Qt5::Multimedia
+ )
else()
set(TARGET marble-behaim)
add_executable (${TARGET} ${marble_SRCS} ${marble_QRCS})
endif()
target_link_libraries (
- ${TARGET}
- ${Qt5Core_LIBRARIES}
- ${Qt5Xml_LIBRARIES}
- ${Qt5Widgets_LIBRARIES}
- ${Qt5PrintSupport_LIBRARIES}
- ${Qt5Network_LIBRARIES}
- ${Qt5WebKitWidgets_LIBRARIES}
- ${Qt5WebKit_LIBRARIES}
- ${Qt5Sql_LIBRARIES}
- ${Qt5Location_LIBRARIES}
- ${Qt5Positioning_LIBRARIES}
- ${Qt5AndroidExtras_LIBRARIES}
- ${Qt5Multimedia_LIBRARIES}
- astro
- ${MARBLEWIDGET}
- marbledeclarative)
+ ${TARGET}
+ marbledeclarative
+)
FILE(GLOB QML_FILES *.qml)
add_custom_target(marble-behaim_resources ALL SOURCES ${QML_FILES} package/AndroidManifest.xml)
@@ -44,8 +49,8 @@
endif()
get_filename_component(ABSOLUTE_INSTALL_PATH "${ABSOLUTE_INSTALL_PATH}" ABSOLUTE)
get_filename_component(QT_ANDROID_QT_ROOT "${Qt5Core_DIR}/../../.." ABSOLUTE)
- set(QT_ANDROID_SDK_ROOT $ENV{ANDROID_SDK})
- set(QT_ANDROID_NDK_ROOT $ENV{ANDROID_NDK})
+ set(ANDROID_SDK_ROOT $ENV{ANDROID_SDK_ROOT})
+ set(ANDROID_NDK_ROOT $ENV{ANDROID_NDK_ROOT})
set(QT_ANDROID_APP_PATH "${ABSOLUTE_INSTALL_PATH}/libs/${ANDROID_ABI}/libMarbleBehaim.so")
set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so")
set(QT_ANDROID_APP_PACKAGE_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/package")
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/apps/behaim/create-apk.py
^
|
@@ -24,7 +24,7 @@
'''
def __init__(self, base):
- self.base = base
+ self.base = base.rstrip(os.sep)
def shouldPackage(self, dir, files):
# Change absolute directory name to one relative to the installation directory
@@ -64,6 +64,9 @@
if len(files) - len(masked) != len(whitelist):
print ('Warning: At least one white-listed plugin is not installed')
return masked
+ elif dir.startswith('/libs/'):
+ # other android app binary
+ return ['libMarble.so']
return []
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/apps/behaim/package/deploy-behaim.json.in
^
|
@@ -1,8 +1,8 @@
{
"description": "This file is to be read by androiddeployqt",
"qt": "@QT_ANDROID_QT_ROOT@",
- "sdk": "@QT_ANDROID_SDK_ROOT@",
- "ndk": "@QT_ANDROID_NDK_ROOT@",
+ "sdk": "@ANDROID_SDK_ROOT@",
+ "ndk": "@ANDROID_NDK_ROOT@",
"toolchain-prefix": "@ANDROID_TOOLCHAIN@",
"tool-prefix": "@ANDROID_TOOLCHAIN@",
"toolchain-version": "@ANDROID_GCC_VERSION@",
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/apps/marble-maps-sailfishos/MainScreen.qml
^
|
@@ -28,7 +28,12 @@
allowedOrientations: Orientation.All
PinchArea {
- anchors.fill: parent
+ anchors {
+ top: parent.top
+ left: parent.left
+ right: parent.right
+ bottom: dialogContainer.top
+ }
enabled: true
onPinchStarted: marbleMaps.handlePinchStarted(pinch.center)
@@ -38,12 +43,7 @@
MarbleMaps {
id: marbleMaps
- anchors {
- top: parent.top
- left: parent.left
- right: parent.right
- bottom: dialogContainer.top
- }
+ anchors.fill: parent
visible: true
focus: true
@@ -121,179 +121,178 @@
visible: false
marbleItem: marbleMaps
}
+
+ PositionMarker {
+ id: positionMarker
+ posX: navigationManager.visible ? navigationManager.snappedPositionMarkerScreenPosition.x : 0
+ posY: navigationManager.visible ? navigationManager.snappedPositionMarkerScreenPosition.y : 0
+ angle: marbleMaps.angle
+ visible: navigationManager.visible
+ }
}
+ }
+
+ BorderImage {
+ anchors.fill: dialogContainer
+ anchors.margins: -14
+ border { top: 14; left: 14; right: 14; bottom: 14 }
+ source: "qrc:///border_shadow.png"
+ }
- BorderImage {
- anchors.fill: dialogContainer
- anchors.margins: -14
- border { top: 14; left: 14; right: 14; bottom: 14 }
- source: "qrc:///border_shadow.png"
+ Item {
+ id: dialogContainer
+ anchors {
+ left: parent.left
+ right: parent.right
+ bottom: parent.bottom
}
+ height: routeEditor.visible ? routeEditor.height : (placemarkDialog.visible ? placemarkDialog.height : 0)
- Item {
- id: dialogContainer
+ RouteEditor {
+ id: routeEditor
anchors {
left: parent.left
right: parent.right
bottom: parent.bottom
}
- height: routeEditor.visible ? routeEditor.height : (placemarkDialog.visible ? placemarkDialog.height : 0)
-
- RouteEditor {
- id: routeEditor
- anchors {
- left: parent.left
- right: parent.right
- bottom: parent.bottom
- }
- visible: false
- }
-
- PlacemarkDialog {
- id: placemarkDialog
- anchors {
- left: parent.left
- right: parent.right
- bottom: parent.bottom
- }
- }
+ visible: false
+ }
- DeveloperDialog {
- id: developerDialog
- visible: false
- anchors {
- left: parent.left
- right: parent.right
- bottom: parent.bottom
- }
+ PlacemarkDialog {
+ id: placemarkDialog
+ anchors {
+ left: parent.left
+ right: parent.right
+ bottom: parent.bottom
}
}
- BoxedText {
- id: distanceIndicator
- text: "%1 km".arg(zoomToPositionButton.distance < 10 ? zoomToPositionButton.distance.toFixed(1) : zoomToPositionButton.distance.toFixed(0))
+ DeveloperDialog {
+ id: developerDialog
+ visible: false
anchors {
- bottom: zoomToPositionButton.top
- horizontalCenter: zoomToPositionButton.horizontalCenter
+ left: parent.left
+ right: parent.right
+ bottom: parent.bottom
}
+ }
+ }
- visible: marbleMaps.positionAvailable && !marbleMaps.positionVisible
+ BoxedText {
+ id: distanceIndicator
+ text: "%1 km".arg(zoomToPositionButton.distance < 10 ? zoomToPositionButton.distance.toFixed(1) : zoomToPositionButton.distance.toFixed(0))
+ anchors {
+ bottom: zoomToPositionButton.top
+ horizontalCenter: zoomToPositionButton.horizontalCenter
}
- PositionButton {
- id: zoomToPositionButton
- anchors {
- horizontalCenter: routeEditorButton.horizontalCenter
- bottom: routeEditorButton.top
- bottomMargin: Theme.paddingMedium
- }
- visible: true
+ visible: marbleMaps.positionAvailable && !marbleMaps.positionVisible
+ }
- iconSource: marbleMaps.positionAvailable ? "qrc:///gps_fixed.png" : "qrc:///gps_not_fixed.png"
+ PositionButton {
+ id: zoomToPositionButton
+ anchors {
+ horizontalCenter: routeEditorButton.horizontalCenter
+ bottom: routeEditorButton.top
+ bottomMargin: Theme.paddingMedium
+ }
+ visible: true
- onClicked: marbleMaps.centerOnCurrentPosition()
+ iconSource: marbleMaps.positionAvailable ? "qrc:///gps_fixed.png" : "qrc:///gps_not_fixed.png"
- property real distance: 0
+ onClicked: marbleMaps.centerOnCurrentPosition()
- function updateIndicator() {
- var point = marbleMaps.mapFromItem(zoomToPositionButton, diameter * 0.5, diameter * 0.5);
- distance = 0.001 * marbleMaps.distanceFromPointToCurrentLocation(point);
- angle = marbleMaps.angleFromPointToCurrentLocation(point);
- }
+ property real distance: 0
- showDirection: marbleMaps.positionAvailable && !marbleMaps.positionVisible
+ function updateIndicator() {
+ var point = marbleMaps.mapFromItem(zoomToPositionButton, diameter * 0.5, diameter * 0.5);
+ distance = 0.001 * marbleMaps.distanceFromPointToCurrentLocation(point);
+ angle = marbleMaps.angleFromPointToCurrentLocation(point);
}
- CircularButton {
- id: routeEditorButton
- anchors {
- right: parent.right
- bottom: dialogContainer.height > 0 ? undefined : parent.bottom
- verticalCenter: dialogContainer.height > 0 ? dialogContainer.top : undefined
- rightMargin: Theme.horizontalPageMargin
- bottomMargin: Theme.horizontalPageMargin
- }
-
- onClicked: {
- if (itemStack.state === "routing") {
- itemStack.state = "navigation"
- } else if (itemStack.state === "place") {
- placemarkDialog.addToRoute()
- } else {
- itemStack.state = "routing"
- }
- }
- iconSource: "qrc:///directions.png";
+ showDirection: marbleMaps.positionAvailable && !marbleMaps.positionVisible
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/apps/marble-maps/CMakeLists.txt
^
|
@@ -7,31 +7,36 @@
set(TARGET Marble)
find_package(Qt5AndroidExtras)
- include_directories(${Qt5AndroidExtras_INCLUDE_DIRS})
add_library (${TARGET} SHARED ${marble_SRCS} ${marble_QRCS})
+
+ # while not directly linked, need to be listed here to have deployqt pick up those libs
+ target_link_libraries (
+ ${TARGET}
+ ${MARBLEWIDGET}
+ astro
+ Qt5::Concurrent
+ Qt5::Xml
+ Qt5::Widgets
+ Qt5::PrintSupport
+ Qt5::Network
+ Qt5::Script
+ Qt5::Sql
+ Qt5::Svg
+ Qt5::Location
+ Qt5::Positioning
+ Qt5::AndroidExtras
+ Qt5::Multimedia
+ )
else()
set(TARGET marble-maps)
add_executable (${TARGET} ${marble_SRCS} ${marble_QRCS})
endif()
target_link_libraries (
- ${TARGET}
- ${Qt5Core_LIBRARIES}
- ${Qt5Xml_LIBRARIES}
- ${Qt5Widgets_LIBRARIES}
- ${Qt5PrintSupport_LIBRARIES}
- ${Qt5Network_LIBRARIES}
- ${Qt5WebKitWidgets_LIBRARIES}
- ${Qt5WebKit_LIBRARIES}
- ${Qt5Sql_LIBRARIES}
- ${Qt5Location_LIBRARIES}
- ${Qt5Positioning_LIBRARIES}
- ${Qt5AndroidExtras_LIBRARIES}
- ${Qt5Multimedia_LIBRARIES}
- astro
- ${MARBLEWIDGET}
- marbledeclarative)
+ ${TARGET}
+ marbledeclarative
+)
FILE(GLOB QML_FILES *.qml)
add_custom_target(marble-maps_resources ALL SOURCES ${QML_FILES} package/AndroidManifest.xml)
@@ -44,8 +49,8 @@
endif()
get_filename_component(ABSOLUTE_INSTALL_PATH "${ABSOLUTE_INSTALL_PATH}" ABSOLUTE)
get_filename_component(QT_ANDROID_QT_ROOT "${Qt5Core_DIR}/../../.." ABSOLUTE)
- set(QT_ANDROID_SDK_ROOT $ENV{ANDROID_SDK})
- set(QT_ANDROID_NDK_ROOT $ENV{ANDROID_NDK})
+ set(ANDROID_SDK_ROOT $ENV{ANDROID_SDK_ROOT})
+ set(ANDROID_NDK_ROOT $ENV{ANDROID_NDK_ROOT})
set(QT_ANDROID_APP_PATH "${ABSOLUTE_INSTALL_PATH}/libs/${ANDROID_ABI}/libMarble.so")
set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so")
set(QT_ANDROID_APP_PACKAGE_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/package")
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/apps/marble-maps/create-apk.py
^
|
@@ -24,7 +24,7 @@
'''
def __init__(self, base):
- self.base = base
+ self.base = base.rstrip(os.sep)
def shouldPackage(self, dir, files):
# Change absolute directory name to one relative to the installation directory
@@ -64,6 +64,9 @@
if len(files) - len(masked) != len(whitelist):
print ('Warning: At least one white-listed plugin is not installed')
return masked
+ elif dir.startswith('/libs/'):
+ # other android app binary
+ return ['libMarbleBehaim.so']
return []
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/apps/marble-maps/package/deploy-marble-maps.json.in
^
|
@@ -1,8 +1,8 @@
{
"description": "This file is to be read by androiddeployqt",
"qt": "@QT_ANDROID_QT_ROOT@",
- "sdk": "@QT_ANDROID_SDK_ROOT@",
- "ndk": "@QT_ANDROID_NDK_ROOT@",
+ "sdk": "@ANDROID_SDK_ROOT@",
+ "ndk": "@ANDROID_NDK_ROOT@",
"toolchain-prefix": "@ANDROID_TOOLCHAIN@",
"tool-prefix": "@ANDROID_TOOLCHAIN@",
"toolchain-version": "@ANDROID_GCC_VERSION@",
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/apps/marble-qt/CMakeLists.txt
^
|
@@ -25,13 +25,11 @@
target_link_libraries (
marble-qt
-${Qt5Core_LIBRARIES}
-${Qt5Xml_LIBRARIES}
-${Qt5Widgets_LIBRARIES}
-${Qt5PrintSupport_LIBRARIES}
-${Qt5Network_LIBRARIES}
-${Qt5WebKitWidgets_LIBRARIES}
-${Qt5WebKit_LIBRARIES}
+Qt5::Xml
+Qt5::Widgets
+Qt5::PrintSupport
+Qt5::Network
+Qt5::WebKitWidgets
marbleui
${MARBLEWIDGET}
astro)
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/apps/marble-touch/CMakeLists.txt
^
|
@@ -5,11 +5,6 @@
${CMAKE_CURRENT_BINARY_DIR}
)
-INCLUDE_DIRECTORIES(
- ${Qt5Qml_INCLUDE_DIRS}
- ${Qt5Quick_INCLUDE_DIRS}
-)
-
set( my_SRCS
main.cpp
)
@@ -21,11 +16,9 @@
add_executable( marble-touch ${my_SRCS} )
target_link_libraries (
marble-touch
- ${Qt5Core_LIBRARIES}
- ${Qt5Widgets_LIBRARIES}
- ${Qt5Network_LIBRARIES}
- ${Qt5WebKitWidgets_LIBRARIES}
- ${Qt5WebKit_LIBRARIES}
+ Qt5::Widgets
+ Qt5::Network
+ Qt5::WebKitWidgets
${MARBLEWIDGET}
marbledeclarative
)
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/apps/marble-ui/CMakeLists.txt
^
|
@@ -11,28 +11,34 @@
add_library (marbleui STATIC ${marble_SRCS})
+# TODO: use PUBLIC/PRIVATE everywhere instead of LINK_PUBLIC/LINK_PRIVATE
+# once SailfishOS has cmake >= 2.8.12
+
target_link_libraries (
marbleui
- ${Qt5Core_LIBRARIES}
- ${Qt5Xml_LIBRARIES}
- ${Qt5Widgets_LIBRARIES}
- ${Qt5PrintSupport_LIBRARIES}
- ${Qt5Network_LIBRARIES}
- ${Qt5WebKitWidgets_LIBRARIES}
- ${Qt5WebKit_LIBRARIES}
- ${MARBLEWIDGET})
+ LINK_PUBLIC
+ ${MARBLEWIDGET}
+ Qt5::Widgets
+ Qt5::PrintSupport
+ LINK_PRIVATE
+ Qt5::Network
+ Qt5::DBus
+)
if(WIN32)
+ # TODO: PUBLIC or can be PRIVATE?
target_link_libraries(
marbleui
- ws2_32
- imm32
- winmm
+ LINK_PUBLIC
+ ws2_32
+ imm32
+ winmm
)
endif(WIN32)
## this works for win32 only because FindQt does not handle this correct
if(STATIC_BUILD)
- target_link_libraries(marble ${QT_PLUGINS_DIR}/imageformats/qjpeg.lib)
- target_link_libraries(marble ${QT_PLUGINS_DIR}/imageformats/qsvg.lib)
+ # TODO: PUBLIC or can be PRIVATE?
+ target_link_libraries(marble LINK_PUBLIC ${QT_PLUGINS_DIR}/imageformats/qjpeg.lib)
+ target_link_libraries(marble LINK_PUBLIC ${QT_PLUGINS_DIR}/imageformats/qsvg.lib)
endif(STATIC_BUILD)
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/lib/astro/CMakeLists.txt
^
|
@@ -22,6 +22,8 @@
)
ADD_LIBRARY(astro SHARED ${astrolib_SRCS})
+generate_export_header(astro BASE_NAME astrolib)
+target_include_directories(astro PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
if (APPLE)
#defined in top level makefile
@@ -65,7 +67,7 @@
eclsolar.h
planetarySats.h
solarsystem.h
- astrolib_export.h
+ ${CMAKE_CURRENT_BINARY_DIR}/astrolib_export.h
DESTINATION ${CMAKE_INSTALL_PREFIX}/include/astro
)
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/lib/marble/CMakeLists.txt
^
|
@@ -23,10 +23,6 @@
${CMAKE_CURRENT_SOURCE_DIR}/osm
${CMAKE_CURRENT_SOURCE_DIR}/cloudsync
${CMAKE_SOURCE_DIR}/src/lib/astro
- ${Qt5WebKitWidgets_INCLUDE_DIRS}
- ${Qt5Xml_INCLUDE_DIRS}
- ${Qt5Concurrent_INCLUDE_DIRS}
- ${Qt5Quick_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS}
)
@@ -40,7 +36,6 @@
set(GENERIC_LIB_SOVERSION "25")
endif()
-# link_directories (${QT_LIBRARY_DIR})
########### next target ###############
if(MARBLE_NO_WEBKITWIDGETS)
@@ -360,37 +355,55 @@
ADD_LIBRARY(${MARBLEWIDGET} SHARED ${marblewidget_SRCS} ${SOURCES_UI_HDRS})
+# TODO: use PUBLIC/PRIVATE everywhere instead of LINK_PUBLIC/LINK_PRIVATE
+# once SailfishOS has cmake >= 2.8.12
+
# link with libastro
-TARGET_LINK_LIBRARIES (${MARBLEWIDGET} astro)
+TARGET_LINK_LIBRARIES (${MARBLEWIDGET} LINK_PRIVATE astro)
# link against zlib
-TARGET_LINK_LIBRARIES (${MARBLEWIDGET} ${ZLIB_LIBRARIES})
+TARGET_LINK_LIBRARIES (${MARBLEWIDGET} LINK_PRIVATE ${ZLIB_LIBRARIES})
# link with release version of Qt libs
TARGET_LINK_LIBRARIES (${MARBLEWIDGET}
-${Qt5Core_LIBRARIES}
-${Qt5Xml_LIBRARIES}
-${Qt5Widgets_LIBRARIES}
-${Qt5Gui_LIBRARIES}
-${Qt5WebKitWidgets_LIBRARIES}
-${Qt5Svg_LIBRARIES}
-${Qt5Script_LIBRARIES}
-${Qt5Quick_LIBRARIES}
-${Qt5PrintSupport_LIBRARIES}
-${Qt5DBus_LIBRARIES}
+ LINK_PUBLIC
+ Qt5::Xml
+ Qt5::Gui
+ Qt5::Widgets
+ Qt5::Quick
+ LINK_PRIVATE
+ Qt5::Svg
+ Qt5::Script
+ Qt5::PrintSupport
+ Qt5::Concurrent
)
+if (NOT MARBLE_NO_WEBKITWIDGETS)
+ TARGET_LINK_LIBRARIES (${MARBLEWIDGET}
+ LINK_PUBLIC
+ Qt5::WebKitWidgets
+ )
+endif ()
+if (NOT QT_NO_DBUS AND NOT CMAKE_SYSTEM_NAME STREQUAL Android)
+ TARGET_LINK_LIBRARIES (${MARBLEWIDGET}
+ LINK_PRIVATE
+ Qt5::DBus
+ )
+endif ()
if (APPLE)
+ # TODO: PUBLIC or can be PRIVATE?
#defined in top level makefile
- TARGET_LINK_LIBRARIES(${MARBLEWIDGET} ${MAC_EXTRA_LIBS} )
+ TARGET_LINK_LIBRARIES(${MARBLEWIDGET} LINK_PUBLIC ${MAC_EXTRA_LIBS} )
endif (APPLE)
+# TODO: still supported?
if (CMAKE_SYSTEM_NAME MATCHES "SunOS")
- TARGET_LINK_LIBRARIES(${MARBLEWIDGET} m)
+ TARGET_LINK_LIBRARIES(${MARBLEWIDGET} LINK_PUBLIC m)
endif (CMAKE_SYSTEM_NAME MATCHES "SunOS")
if(WIN32)
- TARGET_LINK_LIBRARIES(${MARBLEWIDGET} ws2_32 imm32 winmm)
+ # TODO: PUBLIC or can be PRIVATE?
+ TARGET_LINK_LIBRARIES(${MARBLEWIDGET} LINK_PUBLIC ws2_32 imm32 winmm)
endif(WIN32)
if(NOT CMAKE_SYSTEM_NAME STREQUAL Android)
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/lib/marble/declarative/CMakeLists.txt
^
|
@@ -1,16 +1,13 @@
PROJECT( MarbleDeclarativePlugin )
macro_optional_find_package(Qt5Positioning)
-if(Qt5Positioning_LIBRARIES)
+if(Qt5Positioning_FOUND)
add_definitions(-DHAVE_QT5_POSITIONING)
-endif(Qt5Positioning_LIBRARIES)
+endif(Qt5Positioning_FOUND)
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${Qt5Qml_INCLUDE_DIRS}
- ${Qt5Quick_INCLUDE_DIRS}
- ${Qt5Positioning_INCLUDE_DIR}
)
add_library( marbledeclarative SHARED
@@ -45,11 +42,22 @@
marble_add_project_resources(qmldir)
+# TODO: use PUBLIC/PRIVATE everywhere instead of LINK_PUBLIC/LINK_PRIVATE
+# once SailfishOS has cmake >= 2.8.12
+
target_link_libraries( marbledeclarative
- ${Qt5Quick_LIBRARIES}
- ${Qt5Positioning_LIBRARIES}
- ${MARBLEWIDGET}
+ LINK_PUBLIC
+ Qt5::Quick
+ ${MARBLEWIDGET}
+ LINK_PRIVATE
+ Qt5::Script
)
+if(Qt5Positioning_FOUND)
+ target_link_libraries( marbledeclarative
+ LINK_PRIVATE
+ Qt5::Positioning
+ )
+endif()
set_target_properties( marbledeclarative PROPERTIES
INSTALL_RPATH_USE_LINK_PATH TRUE
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/plugins/positionprovider/qtpositioning/CMakeLists.txt
^
|
@@ -3,14 +3,12 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${Qt5Location_INCLUDE_DIR}
- ${Qt5Positioning_INCLUDE_DIR}
)
SET( qtpositioning_SRCS
QtPositioningPositionProviderPlugin.cpp
)
-SET( QtPositioningPositionProviderPlugin_LIBS ${Qt5Location_LIBRARIES} ${Qt5Positioning_LIBRARIES} )
+SET( QtPositioningPositionProviderPlugin_LIBS Qt5::Location Qt5::Positioning )
MARBLE_ADD_PLUGIN( QtPositioningPositionProviderPlugin ${qtpositioning_SRCS} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/plugins/render/compass/CMakeLists.txt
^
|
@@ -10,4 +10,6 @@
qt_wrap_ui( compass_SRCS ${compass_UI} )
qt_add_resources( compass_SRCS compass.qrc )
+set( CompassFloatItem_LIBS Qt5::Svg )
+
marble_add_plugin( CompassFloatItem ${compass_SRCS} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/plugins/render/crosshairs/CMakeLists.txt
^
|
@@ -10,5 +10,6 @@
qt_wrap_ui( crosshairs_SRCS ${crosshairs_UI} )
qt_add_resources( crosshairs_SRCS crosshairs.qrc )
+set( CrosshairsPlugin_LIBS Qt5::Svg )
marble_add_plugin( CrosshairsPlugin ${crosshairs_SRCS} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/plugins/render/earthquake/CMakeLists.txt
^
|
@@ -5,8 +5,6 @@
${CMAKE_CURRENT_BINARY_DIR}
)
-INCLUDE_DIRECTORIES(${Qt5Script_INCLUDE_DIRS})
-
set( my_SRCS
EarthquakePlugin.cpp
EarthquakeModel.cpp
@@ -17,4 +15,6 @@
qt_wrap_ui(my_SRCS ${earthquake_UI})
qt_add_resources(my_SRCS earthquake.qrc)
+set( EarthquakePlugin_LIBS Qt5::Script Qt5::Svg )
+
marble_add_plugin( EarthquakePlugin ${my_SRCS} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/plugins/render/foursquare/CMakeLists.txt
^
|
@@ -11,5 +11,7 @@
FoursquareItem.cpp
)
+set( FoursquarePlugin_LIBS Qt5::Script Qt5::Svg )
+
marble_add_plugin( FoursquarePlugin ${my_SRCS} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/plugins/render/graticule/CMakeLists.txt
^
|
@@ -9,5 +9,6 @@
set( graticule_UI GraticuleConfigWidget.ui )
qt_wrap_ui( graticule_SRCS ${graticule_UI} )
+set( GraticulePlugin_LIBS Qt5::Svg )
marble_add_plugin( GraticulePlugin ${graticule_SRCS} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/plugins/render/opencachingcom/CMakeLists.txt
^
|
@@ -17,5 +17,7 @@
qt_add_resources(my_SRCS opencachingcom.qrc)
+set( OpenCachingComPlugin_LIBS Qt5::Script )
+
MARBLE_ADD_PLUGIN( OpenCachingComPlugin ${my_SRCS} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/plugins/render/opendesktop/CMakeLists.txt
^
|
@@ -5,8 +5,6 @@
${CMAKE_CURRENT_BINARY_DIR}
)
-INCLUDE_DIRECTORIES(${Qt5WebKitWidgets_INCLUDE_DIRS})
-
set( my_SRCS
OpenDesktopPlugin.cpp
OpenDesktopItem.cpp
@@ -16,4 +14,6 @@
set( opendesktop_UI OpenDesktopConfigWidget.ui )
qt_wrap_ui( my_SRCS ${opendesktop_UI} )
+set( OpenDesktopPlugin_LIBS Qt5::Script )
+
marble_add_plugin( OpenDesktopPlugin ${my_SRCS} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/plugins/render/overviewmap/CMakeLists.txt
^
|
@@ -9,4 +9,7 @@
set( overviewmap_UI OverviewMapConfigWidget.ui )
qt_wrap_ui(overviewmap_SRCS ${overviewmap_UI})
+
+set( OverviewMap_LIBS Qt5::Svg )
+
marble_add_plugin( OverviewMap ${overviewmap_SRCS} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/plugins/render/photo/CMakeLists.txt
^
|
@@ -5,8 +5,6 @@
${CMAKE_CURRENT_BINARY_DIR}
)
-INCLUDE_DIRECTORIES(${Qt5WebKitWidgets_INCLUDE_DIRS})
-
set( photo_SRCS PhotoPlugin.cpp
PhotoPluginModel.cpp
PhotoPluginItem.cpp
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/plugins/render/postalcode/CMakeLists.txt
^
|
@@ -12,4 +12,6 @@
PostalCodeItem.cpp
PostalCodeItem.h )
+set( PostalCode_LIBS Qt5::Script )
+
marble_add_plugin( PostalCode ${postalcode_SRCS} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/plugins/render/weather/CMakeLists.txt
^
|
@@ -5,8 +5,6 @@
${CMAKE_CURRENT_BINARY_DIR}
)
-INCLUDE_DIRECTORIES(${Qt5WebKitWidgets_INCLUDE_DIRS})
-
set( weather_SRCS WeatherData.cpp
WeatherItem.cpp
WeatherModel.cpp
@@ -27,4 +25,6 @@
qt_wrap_ui( weather_SRCS ${weather_UI} )
qt_add_resources( weather_SRCS weather.qrc )
+set( Weather_LIBS Qt5::Script Qt5::Svg )
+
marble_add_plugin( Weather ${weather_SRCS} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/plugins/render/wikipedia/CMakeLists.txt
^
|
@@ -5,8 +5,6 @@
${CMAKE_CURRENT_BINARY_DIR}
)
-INCLUDE_DIRECTORIES(${Qt5WebKitWidgets_INCLUDE_DIRS})
-
set( wikipedia_SRCS WikipediaPlugin.cpp
WikipediaModel.cpp
WikipediaItem.cpp
@@ -15,4 +13,6 @@
qt_wrap_ui(wikipedia_SRCS ${wikipedia_UI})
+set( Wikipedia_LIBS Qt5::Svg )
+
marble_add_plugin( Wikipedia ${wikipedia_SRCS} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/plugins/runner/cyclestreets/CMakeLists.txt
^
|
@@ -5,11 +5,6 @@
${CMAKE_CURRENT_BINARY_DIR}
)
-INCLUDE_DIRECTORIES(
- ${Qt5WebKitWidgets_INCLUDE_DIRS}
- ${Qt5Xml_INCLUDE_DIRS}
-)
-
set( cyclestreets_SRCS CycleStreetsRunner.cpp CycleStreetsPlugin.cpp )
set( cyclestreets_UI CycleStreetsConfigWidget.ui )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/plugins/runner/gpx/CMakeLists.txt
^
|
@@ -39,11 +39,10 @@
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/tests )
set( TestTrack_SRCS tests/TestTrack.cpp GpxParser.cpp ${gpx_handlers_SRCS} )
qt_generate_moc( tests/TestTrack.cpp ${CMAKE_CURRENT_BINARY_DIR}/TestTrack.moc )
- include_directories(${Qt5Test_INCLUDE_DIRS})
set( TestTrack_SRCS TestTrack.moc ${TestTrack_SRCS} )
add_executable( TestTrack ${TestTrack_SRCS} )
- target_link_libraries( TestTrack ${Qt5Test_LIBRARIES}
+ target_link_libraries( TestTrack Qt5::Test
${MARBLEWIDGET} )
set_target_properties( TestTrack PROPERTIES
COMPILE_FLAGS "-DDATA_PATH=\"\\\"${DATA_PATH}\\\"\" -DPLUGIN_PATH=\"\\\"${PLUGIN_PATH}\\\"\"" )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/plugins/runner/json/CMakeLists.txt
^
|
@@ -7,4 +7,6 @@
set( json_SRCS JsonRunner.cpp JsonPlugin.cpp JsonParser.cpp )
+set( JsonPlugin_LIBS Qt5::Script )
+
marble_add_plugin( JsonPlugin ${json_SRCS} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/plugins/runner/local-osm-search/CMakeLists.txt
^
|
@@ -5,8 +5,6 @@
${CMAKE_CURRENT_BINARY_DIR}
)
-INCLUDE_DIRECTORIES(${Qt5Sql_INCLUDE_DIRS})
-
set( localOsmSearch_SRCS
LocalOsmSearchRunner.cpp
LocalOsmSearchPlugin.cpp
@@ -16,4 +14,4 @@
)
marble_add_plugin( LocalOsmSearchPlugin ${localOsmSearch_SRCS} )
-target_link_libraries( LocalOsmSearchPlugin ${Qt5Sql_LIBRARIES} )
+target_link_libraries( LocalOsmSearchPlugin Qt5::Sql )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/plugins/runner/mapquest/CMakeLists.txt
^
|
@@ -5,11 +5,6 @@
${CMAKE_CURRENT_BINARY_DIR}
)
-INCLUDE_DIRECTORIES(
- ${Qt5WebKitWidgets_INCLUDE_DIRS}
- ${Qt5Xml_INCLUDE_DIRS}
-)
-
set( mapquest_SRCS MapQuestRunner.cpp MapQuestPlugin.cpp )
set( mapquest_UI MapQuestConfigWidget.ui )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/plugins/runner/monav/CMakeLists.txt
^
|
@@ -5,8 +5,6 @@
${CMAKE_CURRENT_BINARY_DIR}
)
-INCLUDE_DIRECTORIES(${Qt5Xml_INCLUDE_DIRS})
-
set( monav_SRCS
MonavRunner.cpp
MonavPlugin.cpp
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/plugins/runner/nominatim-reversegeocoding/CMakeLists.txt
^
|
@@ -5,11 +5,6 @@
${CMAKE_CURRENT_BINARY_DIR}
)
-INCLUDE_DIRECTORIES(
- ${Qt5WebKitWidgets_INCLUDE_DIRS}
- ${Qt5Xml_INCLUDE_DIRS}
-)
-
set( nominatim_SRCS OsmNominatimReverseGeocodingRunner.cpp NominatimReverseGeocodingPlugin.cpp )
marble_add_plugin( NominatimReverseGeocodingPlugin ${nominatim_SRCS} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/plugins/runner/nominatim-search/CMakeLists.txt
^
|
@@ -5,11 +5,6 @@
${CMAKE_CURRENT_BINARY_DIR}
)
-INCLUDE_DIRECTORIES(
- ${Qt5WebKitWidgets_INCLUDE_DIRS}
- ${Qt5Xml_INCLUDE_DIRS}
-)
-
set( nominatim_SRCS OsmNominatimSearchRunner.cpp NominatimSearchPlugin.cpp )
marble_add_plugin( NominatimSearchPlugin ${nominatim_SRCS} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/plugins/runner/open-source-routing-machine/CMakeLists.txt
^
|
@@ -5,11 +5,8 @@
${CMAKE_CURRENT_BINARY_DIR}
)
-INCLUDE_DIRECTORIES(
- ${Qt5WebKitWidgets_INCLUDE_DIRS}
- ${Qt5Xml_INCLUDE_DIRS}
-)
-
set( osrm_SRCS OSRMRunner.cpp OSRMPlugin.cpp )
+set( OSRMPlugin_LIBS Qt5::Script )
+
marble_add_plugin( OSRMPlugin ${osrm_SRCS} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/plugins/runner/openlocation-code-search/CMakeLists.txt
^
|
@@ -5,8 +5,6 @@
${CMAKE_CURRENT_BINARY_DIR}
)
-INCLUDE_DIRECTORIES(${Qt5Sql_INCLUDE_DIRS})
-
set( openLocationCodeSearch_SRCS
OpenLocationCodeSearchPlugin.cpp
OpenLocationCodeSearchRunner.cpp
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/plugins/runner/openrouteservice/CMakeLists.txt
^
|
@@ -5,11 +5,6 @@
${CMAKE_CURRENT_BINARY_DIR}
)
-INCLUDE_DIRECTORIES(
- ${Qt5WebKitWidgets_INCLUDE_DIRS}
- ${Qt5Xml_INCLUDE_DIRS}
-)
-
set( openrouteservice_SRCS OpenRouteServiceRunner.cpp OpenRouteServicePlugin.cpp )
set( openrouteservice_UI OpenRouteServiceConfigWidget.ui )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/src/plugins/runner/yours/CMakeLists.txt
^
|
@@ -5,11 +5,6 @@
${CMAKE_CURRENT_BINARY_DIR}
)
-INCLUDE_DIRECTORIES(
- ${Qt5WebKitWidgets_INCLUDE_DIRS}
- ${Qt5Xml_INCLUDE_DIRS}
-)
-
set( yours_SRCS YoursRunner.cpp YoursPlugin.cpp )
marble_add_plugin( YoursPlugin ${yours_SRCS} )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/tools/asc2kml/CMakeLists.txt
^
|
@@ -9,4 +9,4 @@
set( ${TARGET}_SRC asc2kml.cpp )
add_executable( ${TARGET} ${${TARGET}_SRC} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} )
+target_link_libraries( ${TARGET} Qt5::Core )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/tools/constellations2kml/CMakeLists.txt
^
|
@@ -10,4 +10,4 @@
add_definitions( -DMAKE_MARBLE_LIB )
add_executable( ${TARGET} ${${TARGET}_SRC} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} marblewidget-qt5 )
+target_link_libraries( ${TARGET} marblewidget-qt5 )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/tools/dateline/CMakeLists.txt
^
|
@@ -10,4 +10,4 @@
add_definitions( -DMAKE_MARBLE_LIB )
add_executable( ${TARGET} ${${TARGET}_SRC} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} marblewidget-qt5 )
+target_link_libraries( ${TARGET} marblewidget-qt5 )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/tools/dso2kml/CMakeLists.txt
^
|
@@ -9,4 +9,4 @@
set( ${TARGET}_SRC dso2kml.cpp )
add_executable( ${TARGET} ${${TARGET}_SRC} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} )
+target_link_libraries( ${TARGET} Qt5::Core )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/tools/iau2kml/CMakeLists.txt
^
|
@@ -9,4 +9,4 @@
set( ${TARGET}_SRC iau2kml.cpp )
add_executable( ${TARGET} ${${TARGET}_SRC} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} )
+target_link_libraries( ${TARGET} Qt5::Core )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/tools/kml2cache/CMakeLists.txt
^
|
@@ -9,4 +9,4 @@
set( ${TARGET}_SRC kml2cache.cpp )
add_definitions( -DMAKE_MARBLE_LIB )
add_executable( ${TARGET} ${${TARGET}_SRC} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} marblewidget-qt5 )
+target_link_libraries( ${TARGET} marblewidget-qt5 )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/tools/kml2kml/CMakeLists.txt
^
|
@@ -10,4 +10,4 @@
add_definitions( -DMAKE_MARBLE_LIB )
add_executable( ${TARGET} ${${TARGET}_SRC} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} marblewidget-qt5 )
+target_link_libraries( ${TARGET} marblewidget-qt5 )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/tools/mapreproject/CMakeLists.txt
^
|
@@ -23,4 +23,4 @@
add_definitions( -DMAKE_MARBLE_LIB )
add_executable( ${TARGET} ${${TARGET}_SRC} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} marblewidget-qt5 )
+target_link_libraries( ${TARGET} marblewidget-qt5 )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/tools/maptheme-previewimage/CMakeLists.txt
^
|
@@ -11,4 +11,4 @@
add_definitions( -DMAKE_MARBLE_LIB )
add_executable( ${TARGET} ${${TARGET}_SRC} ${RESOURCES} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} marblewidget-qt5 )
+target_link_libraries( ${TARGET} marblewidget-qt5 )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/tools/osm-addresses/CMakeLists.txt
^
|
@@ -29,4 +29,4 @@
add_executable( ${TARGET} ${${TARGET}_SRC} ${PROTO_SRCS} ${PROTO_HDRS} )
target_link_libraries( ${TARGET} ${PROTOBUF_LIBRARIES} ${ZLIB_LIBRARIES} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} ${Qt5Sql_LIBRARIES} marblewidget-qt5 )
+target_link_libraries( ${TARGET} Qt5::Sql marblewidget-qt5 )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/tools/osm-sisyphus/CMakeLists.txt
^
|
@@ -19,4 +19,4 @@
add_definitions( -DMAKE_MARBLE_LIB )
add_executable( ${TARGET} ${${TARGET}_SRC} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} ${Qt5Sql_LIBRARIES} marblewidget-qt5 )
+target_link_libraries( ${TARGET} Qt5::Sql marblewidget-qt5 )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/tools/pnt2svg/CMakeLists.txt
^
|
@@ -9,4 +9,4 @@
set( ${TARGET}_SRC pnt2svg.cpp )
add_executable( ${TARGET} ${${TARGET}_SRC} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} )
+target_link_libraries( ${TARGET} Qt5::Core )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/tools/pntdel/CMakeLists.txt
^
|
@@ -9,4 +9,4 @@
set( ${TARGET}_SRC pntdel.cpp )
add_executable( ${TARGET} ${${TARGET}_SRC} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} )
+target_link_libraries( ${TARGET} Qt5::Core )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/tools/pntreplace/CMakeLists.txt
^
|
@@ -9,4 +9,4 @@
set( ${TARGET}_SRC pntreplace.cpp svgxmlhandler.cpp )
add_executable( ${TARGET} ${${TARGET}_SRC} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} ${Qt5Xml_LIBRARIES} ${Qt5Widgets_LIBRARIES} )
+target_link_libraries( ${TARGET} Qt5::Xml Qt5::Widgets )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/tools/poly2kml/CMakeLists.txt
^
|
@@ -10,4 +10,4 @@
add_definitions( -DMAKE_MARBLE_LIB )
add_executable( ${TARGET} ${${TARGET}_SRC} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} marblewidget-qt5 )
+target_link_libraries( ${TARGET} marblewidget-qt5 )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/tools/routing-instructions/CMakeLists.txt
^
|
@@ -16,4 +16,4 @@
add_definitions( -DMAKE_MARBLE_LIB )
add_executable( routing-instructions ${routing-instructions_SRC} )
-target_link_libraries( routing-instructions ${Qt5Core_LIBRARIES} )
+target_link_libraries( routing-instructions Qt5::Core )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/tools/shp2pn2/CMakeLists.txt
^
|
@@ -10,4 +10,4 @@
add_definitions( -DMAKE_MARBLE_LIB )
add_executable( ${TARGET} ${${TARGET}_SRC} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} marblewidget-qt5 )
+target_link_libraries( ${TARGET} marblewidget-qt5 )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/tools/speaker-files/CMakeLists.txt
^
|
@@ -9,4 +9,4 @@
set( ${TARGET}_SRC main.cpp )
add_executable( ${TARGET} ${${TARGET}_SRC} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} ${Qt5Sql_LIBRARIES} )
+target_link_libraries( ${TARGET} Qt5::Core Qt5::Sql )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/tools/stars/CMakeLists.txt
^
|
@@ -10,4 +10,4 @@
add_definitions( -D_USE_MATH_DEFINES=1 )
add_executable( ${TARGET} ${${TARGET}_SRC} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} )
+target_link_libraries( ${TARGET} Qt5::Core )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/tools/svg2pnt/CMakeLists.txt
^
|
@@ -9,4 +9,4 @@
set( ${TARGET}_SRC svg2pnt.cpp svgxmlhandler.cpp )
add_executable( ${TARGET} ${${TARGET}_SRC} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} ${Qt5Xml_LIBRARIES} )
+target_link_libraries( ${TARGET} Qt5::Core Qt5::Xml )
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/tools/tilecreator-srtm2/CMakeLists.txt
^
|
@@ -10,7 +10,7 @@
add_definitions( -DMAKE_MARBLE_LIB -DTILECREATOR )
add_executable( ${TARGET} ${${TARGET}_SRC} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} marblewidget-qt5 )
+target_link_libraries( ${TARGET} marblewidget-qt5 )
if (APPLE)
target_link_libraries (${TARGET} ${APP_SERVICES_LIBRARY})
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160424.tar.xz/tools/tilecreator/CMakeLists.txt
^
|
@@ -10,4 +10,4 @@
add_definitions( -DMAKE_MARBLE_LIB )
add_executable( ${TARGET} ${${TARGET}_SRC} )
-target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} marblewidget-qt5 )
+target_link_libraries( ${TARGET} marblewidget-qt5 )
|
[-]
[+]
|
Changed |
marble.yaml
^
|
@@ -1,6 +1,6 @@
Name: marble
Summary: Virtual Globe
-Version: 1.14.21_sfos_160421
+Version: 1.14.21_sfos_160424
Release: 1
Group: Applications/Engineering
License: LGPLv2+
|