diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/ios/Subsurface-mobile.pro | 4 | ||||
| -rw-r--r-- | profile-widget/qmlprofile.cpp (renamed from mobile-widgets/qmlprofile.cpp) | 2 | ||||
| -rw-r--r-- | profile-widget/qmlprofile.h (renamed from mobile-widgets/qmlprofile.h) | 2 | ||||
| -rw-r--r-- | subsurface-mobile-helper.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 38e786524..7b90f8318 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -285,7 +285,6 @@ endif() if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable") set(MOBILE_SRC mobile-widgets/qmlmanager.cpp - mobile-widgets/qmlprofile.cpp mobile-widgets/qml/kirigami/src/kirigamiplugin.cpp mobile-widgets/qml/kirigami/src/settings.cpp mobile-widgets/qml/kirigami/src/enums.cpp @@ -298,6 +297,7 @@ if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable") mobile-widgets/qml/kirigami/src/libkirigami/platformtheme.cpp subsurface-mobile-main.cpp subsurface-mobile-helper.cpp + profile-widget/qmlprofile.cpp map-widget/qmlmapwidgethelper.cpp ) include_directories(${CMAKE_SOURCE_DIR}/mobile-widgets/qml/kirigami/src/libkirigami) diff --git a/packaging/ios/Subsurface-mobile.pro b/packaging/ios/Subsurface-mobile.pro index 2fed906ee..7686a454b 100644 --- a/packaging/ios/Subsurface-mobile.pro +++ b/packaging/ios/Subsurface-mobile.pro @@ -81,7 +81,6 @@ SOURCES += ../../subsurface-mobile-main.cpp \ ../../core/subsurface-qt/DiveObjectHelper.cpp \ ../../core/subsurface-qt/SettingsObjectWrapper.cpp \ ../../mobile-widgets/qmlmanager.cpp \ - ../../mobile-widgets/qmlprofile.cpp \ ../../qt-models/divelistmodel.cpp \ ../../qt-models/diveplotdatamodel.cpp \ ../../qt-models/gpslistmodel.cpp \ @@ -90,6 +89,7 @@ SOURCES += ../../subsurface-mobile-main.cpp \ ../../qt-models/maplocationmodel.cpp \ ../../qt-models/diveimportedmodel.cpp \ ../../qt-models/messagehandlermodel.cpp \ + ../../profile-widget/qmlprofile.cpp \ ../../profile-widget/divecartesianaxis.cpp \ ../../profile-widget/diveeventitem.cpp \ ../../profile-widget/diveprofileitem.cpp \ @@ -183,7 +183,6 @@ HEADERS += \ ../../core/subsurface-qt/DiveObjectHelper.h \ ../../core/subsurface-qt/SettingsObjectWrapper.h \ ../../mobile-widgets/qmlmanager.h \ - ../../mobile-widgets/qmlprofile.h \ ../../map-widget/qmlmapwidgethelper.h \ ../../qt-models/divelistmodel.h \ ../../qt-models/diveplotdatamodel.h \ @@ -194,6 +193,7 @@ HEADERS += \ ../../qt-models/maplocationmodel.h \ ../../qt-models/diveimportedmodel.h \ ../../qt-models/messagehandlermodel.h \ + ../../profile-widget/qmlprofile.h \ ../../profile-widget/diveprofileitem.h \ ../../profile-widget/profilewidget2.h \ ../../profile-widget/ruleritem.h \ diff --git a/mobile-widgets/qmlprofile.cpp b/profile-widget/qmlprofile.cpp index d6ea5bb50..13c95582b 100644 --- a/mobile-widgets/qmlprofile.cpp +++ b/profile-widget/qmlprofile.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "qmlprofile.h" -#include "qmlmanager.h" +#include "mobile-widgets/qmlmanager.h" #include "core/subsurface-string.h" #include "core/metrics.h" #include <QTransform> diff --git a/mobile-widgets/qmlprofile.h b/profile-widget/qmlprofile.h index 9dcdb6598..07c3e77cc 100644 --- a/mobile-widgets/qmlprofile.h +++ b/profile-widget/qmlprofile.h @@ -2,7 +2,7 @@ #ifndef QMLPROFILE_H #define QMLPROFILE_H -#include "profile-widget/profilewidget2.h" +#include "profilewidget2.h" #include <QQuickPaintedItem> class QMLProfile : public QQuickPaintedItem diff --git a/subsurface-mobile-helper.cpp b/subsurface-mobile-helper.cpp index 933d667bc..df814db15 100644 --- a/subsurface-mobile-helper.cpp +++ b/subsurface-mobile-helper.cpp @@ -19,7 +19,7 @@ #include "mobile-widgets/qmlmanager.h" #include "qt-models/divelistmodel.h" #include "qt-models/gpslistmodel.h" -#include "mobile-widgets/qmlprofile.h" +#include "profile-widget/qmlprofile.h" #include "core/downloadfromdcthread.h" #include "core/connectionlistmodel.h" #include "qt-models/diveimportedmodel.h" |