diff options
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | qt-mobile/qmlmanager.h | 2 | ||||
| -rw-r--r-- | subsurface-core/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | subsurface-core/gpslocation.cpp (renamed from qt-mobile/gpslocation.cpp) | 2 | ||||
| -rw-r--r-- | subsurface-core/gpslocation.h (renamed from qt-mobile/gpslocation.h) | 0 | ||||
| -rw-r--r-- | subsurface-mobile-helper.cpp | 1 |
6 files changed, 5 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d2248f5b..9ee3eb829 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -208,8 +208,6 @@ endif() if(SUBSURFACE_MOBILE) set(QT_QUICK_PKG Quick) set(QT_QUICK_LIB Qt5::Quick) - set(QT_LOCATION_PKG Location) - set(QT_LOCATION_LIB Qt5::Positioning) add_definitions(-DSUBSURFACE_MOBILE) endif() if(ANDROID) @@ -220,8 +218,8 @@ if(BTSUPPORT) set(BLUETOOTH_PKG Bluetooth) set(BLUETOOTH_LIB Qt5::Bluetooth) endif() -find_package(Qt5 REQUIRED COMPONENTS Core Concurrent Widgets Network ${WEBKIT_PKG} ${PRINTING_PKG} Svg Test LinguistTools ${QT_QUICK_PKG} ${ANDROID_PKG} Bluetooth ${QT_LOCATION_PKG}) -set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network ${WEBKIT_LIB} ${PRINTING_LIB} Qt5::Svg ${QT_QUICK_LIB} ${ANDROID_LIB} Qt5::Bluetooth ${QT_LOCATION_LIB}) +find_package(Qt5 REQUIRED COMPONENTS Core Concurrent Widgets Network ${WEBKIT_PKG} ${PRINTING_PKG} Svg Test LinguistTools ${QT_QUICK_PKG} ${ANDROID_PKG} Bluetooth Location) +set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network ${WEBKIT_LIB} ${PRINTING_LIB} Qt5::Svg ${QT_QUICK_LIB} ${ANDROID_LIB} Qt5::Bluetooth Qt5::Positioning) set(QT_TEST_LIBRARIES ${QT_LIBRARIES} Qt5::Test) if (BTSUPPORT AND "${Qt5Core_VERSION_STRING}" STRLESS "5.4.0") @@ -359,7 +357,6 @@ if(SUBSURFACE_MOBILE) set(MOBILE_SRC qt-mobile/qmlmanager.cpp qt-mobile/qmlprofile.cpp - qt-mobile/gpslocation.cpp qt-models/divelistmodel.cpp subsurface-mobile-main.cpp subsurface-mobile-helper.cpp diff --git a/qt-mobile/qmlmanager.h b/qt-mobile/qmlmanager.h index 51b6b39d9..07a7b9f60 100644 --- a/qt-mobile/qmlmanager.h +++ b/qt-mobile/qmlmanager.h @@ -4,7 +4,7 @@ #include <QObject> #include <QString> -#include "qt-mobile/gpslocation.h" +#include "gpslocation.h" void qmlUiShowMessage(const char *errorString); diff --git a/subsurface-core/CMakeLists.txt b/subsurface-core/CMakeLists.txt index e68d3a949..b8c3ed8a0 100644 --- a/subsurface-core/CMakeLists.txt +++ b/subsurface-core/CMakeLists.txt @@ -80,6 +80,7 @@ set(SUBSURFACE_CORE_LIB_SRCS pluginmanager.cpp imagedownloader.cpp isocialnetworkintegration.cpp + gpslocation.cpp ${SERIAL_FTDI} ${PLATFORM_SRC} ${BT_CORE_SRC_FILES} diff --git a/qt-mobile/gpslocation.cpp b/subsurface-core/gpslocation.cpp index a07239b45..4c2879f7c 100644 --- a/qt-mobile/gpslocation.cpp +++ b/subsurface-core/gpslocation.cpp @@ -1,4 +1,4 @@ -#include "qt-mobile/gpslocation.h" +#include "gpslocation.h" #include "pref.h" #include "dive.h" #include "helpers.h" diff --git a/qt-mobile/gpslocation.h b/subsurface-core/gpslocation.h index 55b47f07e..55b47f07e 100644 --- a/qt-mobile/gpslocation.h +++ b/subsurface-core/gpslocation.h diff --git a/subsurface-mobile-helper.cpp b/subsurface-mobile-helper.cpp index f7eaca10f..e982760f8 100644 --- a/subsurface-mobile-helper.cpp +++ b/subsurface-mobile-helper.cpp @@ -18,7 +18,6 @@ #include "qt-mobile/qmlmanager.h" #include "qt-models/divelistmodel.h" #include "qt-mobile/qmlprofile.h" -#include "qt-mobile/gpslocation.h" QObject *qqWindowObject = NULL; |