|
[-]
[+]
|
Changed |
marble.spec
|
|
|
|
[-]
[+]
|
Deleted |
marble-1.14.21_sfos_160417.tar.xz/cmake/modules/FindQtDeclarative.cmake
^
|
| @@ -1,8 +0,0 @@
-if (NOT QT_QTDECLARATIVE_FOUND)
- find_path(QT_QTDECLARATIVE_INCLUDE_DIR NAMES QtDeclarative PATHS ${QT_HEADERS_DIR}/QtDeclarative NO_DEFAULT_PATH)
- find_library(QT_QTDECLARATIVE_LIBRARY NAMES QtDeclarative HINTS ${QT_LIBRARY_DIR})
-
- if (QT_QTDECLARATIVE_INCLUDE_DIR AND QT_QTDECLARATIVE_LIBRARY)
- set(QT_QTDECLARATIVE_FOUND ON)
- endif ()
-endif ()
|
|
[-]
[+]
|
Deleted |
marble-1.14.21_sfos_160417.tar.xz/cmake/modules/FindQtLocation.cmake
^
|
| @@ -1,29 +0,0 @@
-# - Find Qt Location libs
-#
-# This module determines whether QtLocation is installed.
-#
-# Copyright (c) 2011, Daniel Marth, <danielmarth@gmx.at>
-# Copyright (c) 2011, Bernhard Beschow, <bbeschow@cs.tu-berlin.de>
-#
-
-# try using pkg-config first
-include(FindPkgConfig)
-
-pkg_check_modules(QtLocation QtLocation>=1.0.1)
-
-IF(QtLocation_FOUND)
- SET(QTLOCATION_FOUND ${QtLocation_FOUND})
- SET(QTLOCATION_INCLUDE_DIR ${QtLocation_INCLUDE_DIRS})
- SET(QTLOCATION_LIBRARIES ${QtLocation_LIBRARIES})
-ENDIF(QtLocation_FOUND)
-
-# no success using pkg-config, try manually
-IF(NOT QTLOCATION_FOUND)
- FIND_PACKAGE(QtMobility)
- IF(QTMOBILITY_FOUND)
- FIND_PATH(QTLOCATION_INCLUDE_DIR NAMES QGeoPositionInfoSource PATH_SUFFIXES QtLocation)
- FIND_LIBRARY(QTLOCATION_LIBRARIES NAMES QtLocation)
- ENDIF(QTMOBILITY_FOUND)
-
- FIND_PACKAGE_HANDLE_STANDARD_ARGS( QtLocation DEFAULT_MSG QTLOCATION_INCLUDE_DIR QTLOCATION_LIBRARIES )
-ENDIF(NOT QTLOCATION_FOUND)
|
|
[-]
[+]
|
Deleted |
marble-1.14.21_sfos_160417.tar.xz/cmake/modules/FindQtMobility.cmake
^
|
| @@ -1,11 +0,0 @@
-# - Find Qt Mobility libs
-#
-# This module determines whether QtMobility is installed.
-#
-# Copyright (c) 2011, Daniel Marth, <danielmarth@gmx.at>
-#
-
-FIND_PATH( QTMOBILITY_INCLUDE_DIR NAMES qmobilityglobal.h PATH_SUFFIXES QtMobility )
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS( QtMobility DEFAULT_MSG QTMOBILITY_INCLUDE_DIR )
-
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/CMakeLists.txt
^
|
| @@ -1,3 +1,9 @@
+if(SAILFISHOS)
+ cmake_minimum_required(VERSION 2.8.11)
+else()
+ cmake_minimum_required(VERSION 2.8.12)
+endif()
+
project(marble)
####################################################
@@ -60,14 +66,20 @@
find_package(Qt5Location REQUIRED)
find_package(Qt5Positioning REQUIRED)
find_package(Qt5Multimedia REQUIRED)
- set ( MARBLE_NO_WEBKIT TRUE )
+ set ( MARBLE_NO_WEBKITWIDGETS TRUE )
+elseif(SAILFISHOS)
+ find_package(Qt5DBus REQUIRED)
+ find_package(Qt5Location REQUIRED)
+ find_package(Qt5Positioning REQUIRED)
+ find_package(Qt5Multimedia REQUIRED)
+ set ( MARBLE_NO_WEBKITWIDGETS TRUE )
else()
find_package(Qt5WebKit)
find_package(Qt5WebKitWidgets)
find_package(Qt5DBus REQUIRED)
- if ( NOT Qt5WebKit_FOUND OR NOT Qt5WebKitWidgets_FOUND )
- set ( MARBLE_NO_WEBKIT TRUE )
+ if ( NOT Qt5WebKitWidgets_FOUND )
+ set ( MARBLE_NO_WEBKITWIDGETS TRUE )
endif()
endif()
@@ -81,7 +93,6 @@
find_package(Qt5Sql REQUIRED)
find_package(Qt5Concurrent REQUIRED)
find_package(Qt5Quick REQUIRED)
-find_package(Qt5OpenGL REQUIRED)
find_package(Qt5PrintSupport REQUIRED)
if(QTONLY)
@@ -92,7 +103,6 @@
unset(QTONLY)
endif()
-cmake_minimum_required(VERSION 2.8.11.2)
set(MARBLEWIDGET marblewidget-qt5)
include_directories( ${Qt5Svg_INCLUDE_DIRS} )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/MarbleMacros.cmake
^
|
| @@ -36,14 +36,7 @@
macro( marble_add_plugin _target_name )
set( _src ${ARGN} )
add_library( ${_target_name} MODULE ${_src} )
-target_link_libraries( ${_target_name} ${QT_QTCORE_LIBRARY}
- ${QT_QTDBUS_LIBRARY}
- ${QT_QTGUI_LIBRARY}
- ${QT_QTXML_LIBRARY}
- ${QT_QTSVG_LIBRARY}
- ${QT_QTNETWORK_LIBRARY}
- ${QT_QTMAIN_LIBRARY}
- ${${_target_name}_LIBS}
+target_link_libraries( ${_target_name} ${${_target_name}_LIBS}
${MARBLEWIDGET} )
install( TARGETS ${_target_name} DESTINATION ${MARBLE_PLUGIN_INSTALL_PATH} )
@@ -63,14 +56,7 @@
qt_add_resources( _src ../../../apps/marble-ui/marble.qrc )
add_library( ${_target_name} MODULE ${_src} )
-target_link_libraries( ${_target_name} ${QT_QTCORE_LIBRARY}
- ${QT_QTDBUS_LIBRARY}
- ${QT_QTGUI_LIBRARY}
- ${QT_QTXML_LIBRARY}
- ${QT_QTSVG_LIBRARY}
- ${QT_QTNETWORK_LIBRARY}
- ${QT_QTMAIN_LIBRARY}
- ${${_target_name}_LIBS}
+target_link_libraries( ${_target_name} ${${_target_name}_LIBS}
${MARBLEWIDGET} )
install( TARGETS ${_target_name} DESTINATION ${QT_PLUGINS_DIR}/designer )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/data/lang/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC merge_ts_po.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/examples/cpp/animation-video/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC main.cpp)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/examples/cpp/basic-routing/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC main.cpp)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/examples/cpp/custom-layers/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC main.cpp)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/examples/cpp/geopainter/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC main.cpp)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/examples/cpp/hello-marble/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC main.cpp)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/examples/cpp/kml-inspector/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC main.cpp)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/examples/cpp/kml-screenshot/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC main.cpp)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/examples/cpp/map-controls/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC main.cpp)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/examples/cpp/map-properties/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC main.cpp)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/examples/cpp/marble-game/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set(${TARGET}_SRCS
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/examples/cpp/marbleQuick2/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC main.cpp)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/examples/cpp/overlay-rendering/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC main.cpp)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/examples/cpp/pie-charts/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC main.cpp)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/examples/cpp/reverse-geocoding/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC main.cpp)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/examples/cpp/route-image/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC main.cpp)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/examples/cpp/search/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC main.cpp)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/examples/cpp/squad-interpolation/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC squad-interpolation.cpp)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/examples/cpp/tour-preview/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC tour-preview.cpp)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/examples/cpp/vehicletracking/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC vehicletracking.cpp)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/CMakeLists.txt
^
|
| @@ -7,7 +7,7 @@
add_definitions(-DMARBLE_DBUS)
endif(BUILD_WITH_DBUS)
-if( QT_QTDECLARATIVE_FOUND OR Qt5Quick_FOUND )
+if( Qt5Quick_FOUND )
OPTION(IGNORE_CMAKE_INSTALL_PREFIX_FOR_DECLARATIVE_PLUGINS "Install Marble Qt Declarative plugins to QT_IMPORTS_DIR even if that is out of the CMAKE_INSTALL_PREFIX")
IF(QT_IMPORTS_DIR)
SET(MARBLE_QT_IMPORTS_DIR ${QT_IMPORTS_DIR})
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/apps/CMakeLists.txt
^
|
| @@ -1,14 +1,17 @@
-if(FALSE)
-if (NOT CMAKE_SYSTEM_NAME STREQUAL Android)
+if (NOT SAILFISHOS AND NOT CMAKE_SYSTEM_NAME STREQUAL Android)
add_subdirectory(marble-ui)
add_subdirectory(marble-qt)
add_subdirectory(marble-kde)
- if( QT_QTDECLARATIVE_FOUND OR Qt5Quick_FOUND )
+ if( Qt5Quick_FOUND )
add_subdirectory(marble-touch)
- endif( QT_QTDECLARATIVE_FOUND OR Qt5Quick_FOUND )
+ endif( Qt5Quick_FOUND )
endif()
-add_subdirectory(behaim)
-add_subdirectory(marble-maps)
+if (NOT SAILFISHOS)
+ add_subdirectory(behaim)
+ add_subdirectory(marble-maps)
+endif()
+
+if (SAILFISHOS)
+ add_subdirectory(marble-maps-sailfishos)
endif()
-add_subdirectory(marble-maps-sailfishos)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/apps/marble-kde/CMakeLists.txt
^
|
| @@ -19,7 +19,7 @@
)
set(marblepart_SRCS marble_part.cpp)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../marble-ui ${KDE4_INCLUDES})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../marble-ui)
kconfig_add_kcfg_files(marblepart_SRCS settings.kcfgc)
add_library(marble_part ${marblepart_SRCS})
set_target_properties(marble_part PROPERTIES PREFIX "${CMAKE_SHARED_LIBRARY_PREFIX}")
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/apps/marble-maps-sailfishos/SearchField.qml
^
|
| @@ -88,7 +88,7 @@
placeholderText: qsTr("Search")
labelVisible: false
- font.pixelSize: Theme.fontSizeLarge
+ font.pixelSize: Theme.fontSizeMedium
font.family: Theme.fontFamilyHeading
color: palette.text
placeholderColor: palette.mid // TODO: find correct color in palette
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/apps/marble-touch/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES(
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/lib/marble/CMakeLists.txt
^
|
| @@ -43,8 +43,8 @@
# link_directories (${QT_LIBRARY_DIR})
########### next target ###############
-if(MARBLE_NO_WEBKIT)
-add_definitions(-DMARBLE_NO_WEBKIT)
+if(MARBLE_NO_WEBKITWIDGETS)
+add_definitions(-DMARBLE_NO_WEBKITWIDGETS)
endif()
set(marblewidget_SRCS
@@ -282,7 +282,7 @@
)
-if (MARBLE_NO_WEBKIT)
+if (MARBLE_NO_WEBKITWIDGETS)
LIST(APPEND marblewidget_SRCS
NullMarbleWebView.cpp
NullTinyWebBrowser.cpp
@@ -341,7 +341,7 @@
FormattedTextWidget.ui
ElevationWidget.ui
)
-if (MARBLE_NO_WEBKIT)
+if (MARBLE_NO_WEBKITWIDGETS)
LIST(APPEND marblewidget_UI
NullLegendWidget.ui
NullWebPopupWidget.ui
@@ -376,7 +376,6 @@
${Qt5Svg_LIBRARIES}
${Qt5Script_LIBRARIES}
${Qt5Quick_LIBRARIES}
-${Qt5OpenGL_LIBRARIES}
${Qt5PrintSupport_LIBRARIES}
${Qt5DBus_LIBRARIES}
)
@@ -420,7 +419,7 @@
########### install files ###############
-if (MARBLE_NO_WEBKIT)
+if (MARBLE_NO_WEBKITWIDGETS)
set(marble_WebKit
NullMarbleWebView.h
NullTinyWebBrowser.h
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/lib/marble/LegendWidget.cpp
^
|
| @@ -16,7 +16,7 @@
using namespace Marble;
// Ui
-#ifdef MARBLE_NO_WEBKIT
+#ifdef MARBLE_NO_WEBKITWIDGETS
#include "ui_NullLegendWidget.h"
#else
#include "ui_LegendWidget.h"
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/lib/marble/MarbleLegendBrowser.cpp
^
|
| @@ -28,7 +28,7 @@
#include <QStyleOptionButton>
#include <QRegExp>
-#ifndef MARBLE_NO_WEBKIT
+#ifndef MARBLE_NO_WEBKITWIDGETS
#include <QWebFrame>
#include <QWebElement>
#endif
@@ -76,7 +76,7 @@
d->m_suppressSelection = false;
#endif // Q_WS_MAEMO_5
-#ifndef MARBLE_NO_WEBKIT
+#ifndef MARBLE_NO_WEBKITWIDGETS
QWebFrame *frame = page()->mainFrame();
connect(frame, SIGNAL(javaScriptWindowObjectCleared()),
this, SLOT(injectCheckBoxChecker()));
@@ -137,7 +137,7 @@
return;
}
-#ifndef MARBLE_NO_WEBKIT
+#ifndef MARBLE_NO_WEBKITWIDGETS
if (d->m_currentThemeId != d->m_marbleModel->mapThemeId()) {
d->m_currentThemeId = d->m_marbleModel->mapThemeId();
} else {
@@ -186,7 +186,7 @@
void MarbleLegendBrowser::injectCheckBoxChecker()
{
-#ifndef MARBLE_NO_WEBKIT
+#ifndef MARBLE_NO_WEBKITWIDGETS
QWebFrame *frame = page()->mainFrame();
frame->addToJavaScriptWindowObject( "Marble", this );
#endif
@@ -385,7 +385,7 @@
void MarbleLegendBrowser::setCheckedProperty( const QString& name, bool checked )
{
-#ifndef MARBLE_NO_WEBKIT
+#ifndef MARBLE_NO_WEBKITWIDGETS
QWebElement box = page()->mainFrame()->findFirstElement("input[name="+name+']');
if (!box.isNull()) {
if (checked != d->m_checkBoxMap[name]) {
@@ -400,7 +400,7 @@
void MarbleLegendBrowser::setRadioCheckedProperty( const QString& value, const QString& name , bool checked )
{
-#ifndef MARBLE_NO_WEBKIT
+#ifndef MARBLE_NO_WEBKITWIDGETS
QWebElement box = page()->mainFrame()->findFirstElement("input[value="+value+']');
QWebElementCollection boxes = page()->mainFrame()->findAllElements("input[name="+name+']');
QString currentValue="";
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/lib/marble/MarbleLegendBrowser.h
^
|
| @@ -20,7 +20,7 @@
#include <QString>
-#ifdef MARBLE_NO_WEBKIT
+#ifdef MARBLE_NO_WEBKITWIDGETS
#include "NullMarbleWebView.h"
#else
#include "MarbleWebView.h"
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/lib/marble/cloudsync/RouteItemDelegate.cpp
^
|
| @@ -2,7 +2,7 @@
#include <QPainter>
-#ifdef MARBLE_NO_WEBKIT
+#ifdef MARBLE_NO_WEBKITWIDGETS
#include <QWidget>
#else
#include <QWebView>
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/lib/marble/declarative/CMakeLists.txt
^
|
| @@ -8,7 +8,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
${Qt5Qml_INCLUDE_DIRS}
${Qt5Quick_INCLUDE_DIRS}
${Qt5Positioning_INCLUDE_DIR}
@@ -47,14 +46,6 @@
marble_add_project_resources(qmldir)
target_link_libraries( marbledeclarative
- ${QT_QTCORE_LIBRARY}
- ${QT_QTDBUS_LIBRARY}
- ${QT_QTGUI_LIBRARY}
- ${QT_QTXML_LIBRARY}
- ${QT_QTSVG_LIBRARY}
- ${QT_QTNETWORK_LIBRARY}
- ${QT_QTMAIN_LIBRARY}
- ${QT_QTDECLARATIVE_LIBRARY}
${Qt5Quick_LIBRARIES}
${Qt5Positioning_LIBRARIES}
${MARBLEWIDGET}
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/lib/marble/routing/RoutingInputWidget.cpp
^
|
| @@ -15,7 +15,7 @@
#include "MarblePlacemarkModel.h"
#include "RouteRequest.h"
-#ifdef MARBLE_NO_WEBKIT
+#ifdef MARBLE_NO_WEBKITWIDGETS
#include "NullTinyWebBrowser.h"
#else
#include "TinyWebBrowser.h"
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/CMakeLists.txt
^
|
| @@ -1,9 +1,7 @@
-if(FALSE)
-if(NOT CMAKE_SYSTEM_NAME STREQUAL Android)
+if(NOT SAILFISHOS AND NOT CMAKE_SYSTEM_NAME STREQUAL Android)
add_subdirectory( designer )
add_subdirectory( templates )
endif()
-endif()
add_subdirectory( render )
add_subdirectory( positionprovider )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/designer/latloneditwidget/CMakeLists.txt
^
|
| @@ -3,10 +3,8 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
- ${QT_QTDESIGNER_INCLUDE_DIR}
+ ${Qt5Designer_INCLUDE_DIRS}
)
-INCLUDE_DIRECTORIES(${Qt5Designer_INCLUDE_DIRS})
#target_link_libraries( ${MARBLEWIDGET} )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/designer/marblewidget/CMakeLists.txt
^
|
| @@ -3,10 +3,8 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
- ${QT_QTDESIGNER_INCLUDE_DIR}
+ ${Qt5Designer_INCLUDE_DIRS}
)
-INCLUDE_DIRECTORIES(${Qt5Designer_INCLUDE_DIRS})
set( marbleplugin_SRCS MarbleWidgetPlugin.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/designer/navigator/CMakeLists.txt
^
|
| @@ -3,10 +3,8 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
- ${QT_QTDESIGNER_INCLUDE_DIR}
+ ${Qt5Designer_INCLUDE_DIRS}
)
-INCLUDE_DIRECTORIES(${Qt5Designer_INCLUDE_DIRS})
set( marblenavigator_SRCS MarbleNavigatorPlugin.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/positionprovider/flightgear/CMakeLists.txt
^
|
| @@ -3,9 +3,7 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
-set( QT_USE_QTNETWORK ON )
set( flightgear_SRCS FlightGearPositionProviderPlugin.cpp )
set( FlightGearPositionProviderPlugin_LIBS )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/positionprovider/geoclue/CMakeLists.txt
^
|
| @@ -3,11 +3,8 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
-include(${QT_USE_FILE})
-
set( geoclue_SRCS
GeoCluePositionProviderPlugin.cpp
GeoCute/Accuracy.cpp
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/positionprovider/geoclue/GeoCute/CMakeLists.txt
^
|
| @@ -1,5 +1,4 @@
include_directories(
- ${QT_INCLUDES}
${CMAKE_CURRENT_BINARY_DIR}
)
@@ -18,9 +17,4 @@
add_library(GeoCute SHARED ${GeoCute_SRCS})
-target_link_libraries(GeoCute
- ${QT_QTCORE_LIBRARY}
- ${QT_QTDBUS_LIBRARY}
-)
-
set_target_properties(GeoCute PROPERTIES DEFINE_SYMBOL MAKE_GEOCUTE_LIB)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/positionprovider/gpsd/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
${LIBGPS_INCLUDE_DIR}
)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/positionprovider/maemo/CMakeLists.txt
^
|
| @@ -3,12 +3,9 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
${liblocation_INCLUDE_DIRS}
)
-include(${QT_USE_FILE})
-
set( maemo_SRCS
MaemoPositionProviderPlugin.cpp
)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/positionprovider/placemark/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( placemark_SRCS
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/positionprovider/qtpositioning/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
${Qt5Location_INCLUDE_DIR}
${Qt5Positioning_INCLUDE_DIR}
)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/positionprovider/routesimulation/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( the_SRCS
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/positionprovider/wlocate/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
${liblocation_INCLUDE_DIRS}
)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/CMakeLists.txt
^
|
| @@ -32,7 +32,7 @@
# Disabled for now until legal issues wrt to the API
# and terms of service of opencaching are cleared up.
#add_subdirectory( opencaching )
-if(NOT MARBLE_NO_WEBKIT)
+if(NOT MARBLE_NO_WEBKITWIDGETS)
add_subdirectory( opencachingcom )
add_subdirectory( opendesktop )
add_subdirectory( photo )
@@ -41,7 +41,7 @@
add_subdirectory( postalcode )
add_subdirectory( satellites )
# add_subdirectory ( twitter )
-if(NOT MARBLE_NO_WEBKIT)
+if(NOT MARBLE_NO_WEBKITWIDGETS)
add_subdirectory( wikipedia )
add_subdirectory( weather )
endif()
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/annotate/CMakeLists.txt
^
|
| @@ -5,7 +5,6 @@
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src/lib/marble/geodata/handlers/kml
${CMAKE_SOURCE_DIR}/src/lib/marble/layers
- ${QT_INCLUDE_DIR}
)
set( annotate_UI
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/aprs/CMakeLists.txt
^
|
| @@ -8,7 +8,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
if (QEXTSERIALPORT_FOUND)
@@ -41,7 +40,6 @@
)
marble_add_plugin( AprsPlugin ${aprs_SRCS} )
-#target_link_libraries( Aprs ${QT_QTWEBKIT_LIBRARY} )
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/aprsconfig.h.in
${CMAKE_CURRENT_BINARY_DIR}/aprsconfig.h)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/atmosphere/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( atmosphere_SRCS AtmospherePlugin.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/compass/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( compass_SRCS CompassFloatItem.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/crosshairs/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( crosshairs_SRCS CrosshairsPlugin.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/earthquake/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES(${Qt5Script_INCLUDE_DIRS})
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/eclipses/CMakeLists.txt
^
|
| @@ -2,9 +2,8 @@
INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/lib/astro
- ${CMAKE_CURRENT_SOURCE_DIR}/src/plugins/render/eclipses
- ${CMAKE_BINARY_DIR}/src/plugins/render/eclipses
- ${QT_INCLUDE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
)
set( eclipses_SRCS
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/elevationprofilefloatitem/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( my_SRCS
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/elevationprofilemarker/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( my_SRCS
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/fileview/CMakeLists.txt
^
|
| @@ -1,9 +1,7 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
-INCLUDE(${QT_USE_FILE})
set( fileview_SRCS FileViewFloatItem.cpp )
#set( fileview_UI fileview.ui )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/foursquare/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( my_SRCS
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/gpsinfo/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( gpsinfo_SRCS GpsInfo.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/graticule/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( graticule_SRCS GraticulePlugin.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/inhibit-screensaver/CMakeLists.txt
^
|
| @@ -6,8 +6,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
- ${QT_QTNETWORK_INCLUDE_DIR}
)
set( inhibit-screensaver_SRCS InhibitScreensaverPlugin.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/license/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( license_SRCS License.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/mapscale/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( mapscale_SRCS MapScaleFloatItem.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/measure/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( measuretool_SRCS MeasureToolPlugin.cpp MeasureConfigDialog.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/navigation/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( navigation_SRCS NavigationFloatItem.cpp ArrowDiscWidget.cpp NavigationButton.cpp NavigationSlider.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/opencaching/CMakeLists.txt
^
|
| @@ -3,9 +3,7 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
-INCLUDE(${QT_USE_FILE})
SET( my_SRCS
OpenCachingPlugin.cpp
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/opencachingcom/CMakeLists.txt
^
|
| @@ -2,7 +2,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_BINARY_DIR}/src/plugins/render/opencachingcom
- ${QT_INCLUDE_DIR}
)
SET( my_SRCS
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/opendesktop/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES(${Qt5WebKitWidgets_INCLUDE_DIRS})
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/overviewmap/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( overviewmap_SRCS OverviewMap.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/panoramio/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( panoramio_SRCS PanoramioPlugin.cpp
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/photo/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES(${Qt5WebKitWidgets_INCLUDE_DIRS})
@@ -18,4 +17,3 @@
qt_wrap_ui(photo_SRCS ${photo_UI})
marble_add_plugin( Photo ${photo_SRCS} )
-target_link_libraries( Photo ${QT_QTGUI_LIBRARY} ${QT_QTWEBKIT_LIBRARY} )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/positionmarker/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( positionmarker_SRCS PositionMarker.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/postalcode/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( postalcode_SRCS PostalCodePlugin.cpp
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/progress/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( progress_SRCS ProgressFloatItem.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/routing/CMakeLists.txt
^
|
| @@ -8,7 +8,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
${PHONON_INCLUDES}
)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/satellites/CMakeLists.txt
^
|
| @@ -5,7 +5,6 @@
${CMAKE_SOURCE_DIR}/src/3rdparty/sgp4
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( satellites_SRCS
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/speedometer/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( speedometer_SRCS Speedometer.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/stars/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
${CMAKE_SOURCE_DIR}/src/lib/astro
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( stars_SRCS StarsPlugin.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/sun/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( sun_SRCS SunPlugin.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/test/CMakeLists.txt
^
|
| @@ -3,9 +3,7 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
-INCLUDE(${QT_USE_FILE})
set( test_SRCS TestPlugin.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/weather/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES(${Qt5WebKitWidgets_INCLUDE_DIRS})
@@ -29,4 +28,3 @@
qt_add_resources( weather_SRCS weather.qrc )
marble_add_plugin( Weather ${weather_SRCS} )
-target_link_libraries( Weather ${QT_QTWEBKIT_LIBRARY} )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/render/wikipedia/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES(${Qt5WebKitWidgets_INCLUDE_DIRS})
@@ -17,4 +16,3 @@
qt_wrap_ui(wikipedia_SRCS ${wikipedia_UI})
marble_add_plugin( Wikipedia ${wikipedia_SRCS} )
-target_link_libraries( Wikipedia ${QT_QTWEBKIT_LIBRARY})
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/runner/cache/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( cache_SRCS CachePlugin.cpp CacheRunner.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/runner/cyclestreets/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES(
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/runner/gosmore-reversegeocoding/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( gosmore_SRCS GosmoreReverseGeocodingRunner.cpp GosmoreReverseGeocodingPlugin.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/runner/gosmore-routing/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( gosmore_SRCS GosmoreRoutingRunner.cpp GosmoreRoutingPlugin.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/runner/gpsbabel/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( gpsbabel_SRCS GpsbabelPlugin.cpp GpsbabelRunner.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/runner/gpx/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/handlers
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( gpx_handlers_SRCS
@@ -40,19 +39,12 @@
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(
- ${CMAKE_CURRENT_BINARY_DIR}/tests
- )
include_directories(${Qt5Test_INCLUDE_DIRS})
set( TestTrack_SRCS TestTrack.moc ${TestTrack_SRCS} )
add_executable( TestTrack ${TestTrack_SRCS} )
- target_link_libraries( TestTrack ${QT_QTMAIN_LIBRARY}
- ${QT_QTCORE_LIBRARY}
- ${QT_QTGUI_LIBRARY}
- ${QT_QTTEST_LIBRARY}
+ target_link_libraries( TestTrack ${Qt5Test_LIBRARIES}
${MARBLEWIDGET} )
- target_link_libraries( TestTrack ${Qt5Test_LIBRARIES})
set_target_properties( TestTrack PROPERTIES
COMPILE_FLAGS "-DDATA_PATH=\"\\\"${DATA_PATH}\\\"\" -DPLUGIN_PATH=\"\\\"${PLUGIN_PATH}\\\"\"" )
add_test( TestTrack TestTrack )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/runner/hostip/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( hostip_SRCS HostipRunner.cpp HostipPlugin.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/runner/json/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( json_SRCS JsonRunner.cpp JsonPlugin.cpp JsonParser.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/runner/kml/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src/lib/marble/geodata/handlers/kml
- ${QT_INCLUDE_DIR}
)
set( kml_SRCS KmlDocument.cpp KmlParser.cpp KmlPlugin.cpp KmlRunner.cpp KmzHandler.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/runner/latlon/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( latlon_SRCS LatLonRunner.cpp LatLonPlugin.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/runner/local-osm-search/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES(${Qt5Sql_INCLUDE_DIRS})
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/runner/localdatabase/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( localdatabase_SRCS LocalDatabaseRunner.cpp LocalDatabasePlugin.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/runner/log/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( log_SRCS LogPlugin.cpp LogRunner.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/runner/mapquest/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES(
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/runner/monav/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES(${Qt5Xml_INCLUDE_DIRS})
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/runner/nominatim-reversegeocoding/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES(
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/runner/nominatim-search/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES(
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/runner/open-source-routing-machine/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES(
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/runner/openlocation-code-search/CMakeLists.txt
^
|
| @@ -3,13 +3,9 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
-if( QT4BUILD )
- INCLUDE(${QT_USE_FILE})
-else()
- INCLUDE_DIRECTORIES(${Qt5Sql_INCLUDE_DIRS})
-endif()
+
+INCLUDE_DIRECTORIES(${Qt5Sql_INCLUDE_DIRS})
set( openLocationCodeSearch_SRCS
OpenLocationCodeSearchPlugin.cpp
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/runner/openrouteservice/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES(
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/runner/osm/CMakeLists.txt
^
|
| @@ -5,7 +5,6 @@
${CMAKE_CURRENT_SOURCE_DIR}/writers
${CMAKE_CURRENT_SOURCE_DIR}/translators
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( osm_writers_SRCS
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/runner/pn2/CMakeLists.txt
^
|
| @@ -2,7 +2,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_BINARY_DIR}/src/plugins/runner/pn2
- ${QT_INCLUDE_DIR}
)
set( pn2_SRCS Pn2Plugin.cpp Pn2Runner.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/runner/pnt/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( pnt_SRCS PntPlugin.cpp PntRunner.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/runner/routino/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( routino_SRCS RoutinoRunner.cpp RoutinoPlugin.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/runner/shp/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
${LIBSHP_INCLUDE_DIR}
)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/runner/traveling-salesman/CMakeLists.txt
^
|
| @@ -3,9 +3,7 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
-INCLUDE(${QT_USE_FILE})
set( travelingsalesman_SRCS TravelingSalesmanRunner.cpp TravelingSalesmanPlugin.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/runner/yours/CMakeLists.txt
^
|
| @@ -3,7 +3,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
INCLUDE_DIRECTORIES(
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/src/plugins/templates/floatitem/CMakeLists.txt
^
|
| @@ -10,9 +10,7 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
-INCLUDE(${QT_USE_FILE})
set( FITemplate_SRCS FITemplateFloatItem.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/tools/asc2kml/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC asc2kml.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/tools/constellations2kml/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC constellations2kml.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/tools/dateline/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC dateline.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/tools/dso2kml/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC dso2kml.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/tools/dso2kml/dso2kml.cpp
^
|
| @@ -11,7 +11,7 @@
#include <QFile>
#include <QDebug>
-#include <QApplication>
+#include <QCoreApplication>
#include <QStringList>
#include <cmath>
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/tools/iau2kml/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC iau2kml.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/tools/kml2cache/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC kml2cache.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/tools/kml2kml/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC kml2kml.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/tools/mapreproject/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/tools/maptheme-previewimage/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC main.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/tools/osm-addresses/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
${PROTOBUF_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS}
../../src/plugins/runner/local-osm-search
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/tools/osm-sisyphus/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/tools/pnt2svg/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC pnt2svg.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/tools/pntdel/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC pntdel.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/tools/pntreplace/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC pntreplace.cpp svgxmlhandler.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/tools/poly2kml/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC main.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/tools/routing-instructions/CMakeLists.txt
^
|
| @@ -2,7 +2,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( routing-instructions_SRC
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/tools/shp2pn2/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC shp2pn2.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/tools/speaker-files/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC main.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/tools/stars/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC stars.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/tools/stars/stars.cpp
^
|
| @@ -13,7 +13,7 @@
#include <QFile>
#include <QDebug>
-#include <QApplication>
+#include <QCoreApplication>
#include <QStringList>
#include <QFileInfo>
#include <QDataStream>
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/tools/svg2pnt/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC svg2pnt.cpp svgxmlhandler.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/tools/tilecreator-srtm2/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC main.cpp tccore.cpp )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160420.tar.xz/tools/tilecreator/CMakeLists.txt
^
|
| @@ -4,7 +4,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${QT_INCLUDE_DIR}
)
set( ${TARGET}_SRC main.cpp tccore.cpp )
|
|
[-]
[+]
|
Changed |
marble.yaml
^
|
| @@ -1,6 +1,6 @@
Name: marble
Summary: Virtual Globe
-Version: 1.14.21_sfos_160417
+Version: 1.14.21_sfos_160420
Release: 1
Group: Applications/Engineering
License: LGPLv2+
@@ -19,12 +19,11 @@
- Qt5Core
- Qt5Quick
- Qt5Script
- - Qt5Test
+ #- Qt5Test
- Qt5Widgets
- Qt5Svg
- Qt5Sql
- Qt5Concurrent
- - Qt5OpenGL
- Qt5PrintSupport
PkgBR:
- cmake
@@ -35,6 +34,7 @@
- -DBUILD_TESTING=OFF
- -DBUILD_MARBLE_TESTS=NO
- -DEXPERIMENTAL_VECTOR_TILING=ON
+ - -DSAILFISHOS=TRUE
Builder: cmake
Files:
- '%{_bindir}/marble-maps'
|
