mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-11 03:21:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

profile: make profile self contained

Browse source 
move qmlprofile.* to profile dir, to keep all parts of the
widget in one place.

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-06-08 12:56:23 +02:00 committed by Dirk Hohndel
parent cade4829a3
commit aab8f0dcf6
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -285,7 +285,6 @@ endif()
if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable") if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable")
set(MOBILE_SRC set(MOBILE_SRC
mobile-widgets/qmlmanager.cpp mobile-widgets/qmlmanager.cpp
mobile-widgets/qmlprofile.cpp
mobile-widgets/qml/kirigami/src/kirigamiplugin.cpp mobile-widgets/qml/kirigami/src/kirigamiplugin.cpp
mobile-widgets/qml/kirigami/src/settings.cpp mobile-widgets/qml/kirigami/src/settings.cpp
mobile-widgets/qml/kirigami/src/enums.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 mobile-widgets/qml/kirigami/src/libkirigami/platformtheme.cpp
subsurface-mobile-main.cpp subsurface-mobile-main.cpp
subsurface-mobile-helper.cpp subsurface-mobile-helper.cpp
profile-widget/qmlprofile.cpp
map-widget/qmlmapwidgethelper.cpp map-widget/qmlmapwidgethelper.cpp
) )
include_directories(${CMAKE_SOURCE_DIR}/mobile-widgets/qml/kirigami/src/libkirigami) include_directories(${CMAKE_SOURCE_DIR}/mobile-widgets/qml/kirigami/src/libkirigami)

4
packaging/ios/Subsurface-mobile.pro
View file

@ -81,7 +81,6 @@ SOURCES += ../../subsurface-mobile-main.cpp \
../../core/subsurface-qt/DiveObjectHelper.cpp \ ../../core/subsurface-qt/DiveObjectHelper.cpp \
../../core/subsurface-qt/SettingsObjectWrapper.cpp \ ../../core/subsurface-qt/SettingsObjectWrapper.cpp \
../../mobile-widgets/qmlmanager.cpp \ ../../mobile-widgets/qmlmanager.cpp \
../../mobile-widgets/qmlprofile.cpp \
../../qt-models/divelistmodel.cpp \ ../../qt-models/divelistmodel.cpp \
../../qt-models/diveplotdatamodel.cpp \ ../../qt-models/diveplotdatamodel.cpp \
../../qt-models/gpslistmodel.cpp \ ../../qt-models/gpslistmodel.cpp \
@ -90,6 +89,7 @@ SOURCES += ../../subsurface-mobile-main.cpp \
../../qt-models/maplocationmodel.cpp \ ../../qt-models/maplocationmodel.cpp \
../../qt-models/diveimportedmodel.cpp \ ../../qt-models/diveimportedmodel.cpp \
../../qt-models/messagehandlermodel.cpp \ ../../qt-models/messagehandlermodel.cpp \
../../profile-widget/qmlprofile.cpp \
../../profile-widget/divecartesianaxis.cpp \ ../../profile-widget/divecartesianaxis.cpp \
../../profile-widget/diveeventitem.cpp \ ../../profile-widget/diveeventitem.cpp \
../../profile-widget/diveprofileitem.cpp \ ../../profile-widget/diveprofileitem.cpp \
@ -183,7 +183,6 @@ HEADERS += \
../../core/subsurface-qt/DiveObjectHelper.h \ ../../core/subsurface-qt/DiveObjectHelper.h \
../../core/subsurface-qt/SettingsObjectWrapper.h \ ../../core/subsurface-qt/SettingsObjectWrapper.h \
../../mobile-widgets/qmlmanager.h \ ../../mobile-widgets/qmlmanager.h \
../../mobile-widgets/qmlprofile.h \
../../map-widget/qmlmapwidgethelper.h \ ../../map-widget/qmlmapwidgethelper.h \
../../qt-models/divelistmodel.h \ ../../qt-models/divelistmodel.h \
../../qt-models/diveplotdatamodel.h \ ../../qt-models/diveplotdatamodel.h \
@ -194,6 +193,7 @@ HEADERS += \
../../qt-models/maplocationmodel.h \ ../../qt-models/maplocationmodel.h \
../../qt-models/diveimportedmodel.h \ ../../qt-models/diveimportedmodel.h \
../../qt-models/messagehandlermodel.h \ ../../qt-models/messagehandlermodel.h \
../../profile-widget/qmlprofile.h \
../../profile-widget/diveprofileitem.h \ ../../profile-widget/diveprofileitem.h \
../../profile-widget/profilewidget2.h \ ../../profile-widget/profilewidget2.h \
../../profile-widget/ruleritem.h \ ../../profile-widget/ruleritem.h \

2
mobile-widgets/qmlprofile.cpp → profile-widget/qmlprofile.cpp
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include "qmlprofile.h" #include "qmlprofile.h"
#include "qmlmanager.h" #include "mobile-widgets/qmlmanager.h"
#include "core/subsurface-string.h" #include "core/subsurface-string.h"
#include "core/metrics.h" #include "core/metrics.h"
#include <QTransform> #include <QTransform>

2
mobile-widgets/qmlprofile.h → profile-widget/qmlprofile.h
View file

@ -2,7 +2,7 @@
#ifndef QMLPROFILE_H #ifndef QMLPROFILE_H
#define QMLPROFILE_H #define QMLPROFILE_H
#include "profile-widget/profilewidget2.h" #include "profilewidget2.h"
#include <QQuickPaintedItem> #include <QQuickPaintedItem>
class QMLProfile : public QQuickPaintedItem class QMLProfile : public QQuickPaintedItem

2
subsurface-mobile-helper.cpp
View file

@ -19,7 +19,7 @@
#include "mobile-widgets/qmlmanager.h" #include "mobile-widgets/qmlmanager.h"
#include "qt-models/divelistmodel.h" #include "qt-models/divelistmodel.h"
#include "qt-models/gpslistmodel.h" #include "qt-models/gpslistmodel.h"
#include "mobile-widgets/qmlprofile.h" #include "profile-widget/qmlprofile.h"
#include "core/downloadfromdcthread.h" #include "core/downloadfromdcthread.h"
#include "core/connectionlistmodel.h" #include "core/connectionlistmodel.h"
#include "qt-models/diveimportedmodel.h" #include "qt-models/diveimportedmodel.h"