diff options
| author |  jan Iversen <jani@apache.org> | 2018-08-20 11:51:48 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-08-25 11:49:47 -0700 |
| commit | ebc0e6d3f3edb90851295399dd22e081fe00a0c8 (patch) | |
| tree | 5d08f827e6ed92eb26a778b540e132dbfad5742a /packaging/ios | |
| parent | 82b626b3fdd82bbe251d56a9972941ed207825a3 (diff) | |
| download | subsurface-ebc0e6d3f3edb90851295399dd22e081fe00a0c8.tar.gz | |
core/tests: merge Animations and add vars. to qPrefDisplay
Add class variable tooltip_position to qPrefDisplay
Add class variable lastDir to qPrefDisplay
qPrefDisplay is updated to use new qPrefPrivate functions
Adjust test cases incl. qml tests
qPrefAnimations only has 1 variable, that really is a display variable
Merge the variable into qPrefDisplay, to simplify setup (and avoid loading
extra page in qml).
correct theme to save in correct place, and make it a static
class variable
Signed-off-by: Jan Iversen <jani@apache.org>
Diffstat (limited to 'packaging/ios')
| -rw-r--r-- | packaging/ios/Subsurface-mobile.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/packaging/ios/Subsurface-mobile.pro b/packaging/ios/Subsurface-mobile.pro index f065fcd7f..7637480cb 100644 --- a/packaging/ios/Subsurface-mobile.pro +++ b/packaging/ios/Subsurface-mobile.pro @@ -78,7 +78,6 @@ SOURCES += ../../subsurface-mobile-main.cpp \ ../../core/connectionlistmodel.cpp \ ../../core/qt-ble.cpp \ ../../core/settings/qPref.cpp \ - ../../core/settings/qPrefAnimations.cpp \ ../../core/settings/qPrefCloudStorage.cpp \ ../../core/settings/qPrefDisplay.cpp \ ../../core/settings/qPrefDiveComputer.cpp \ @@ -200,7 +199,6 @@ HEADERS += \ ../../core/connectionlistmodel.h \ ../../core/qt-ble.h \ ../../core/settings/qPref.h \ - ../../core/settings/qPrefAnimations.h \ ../../core/settings/qPrefCloudStorage.h \ ../../core/settings/qPrefDisplay.h \ ../../core/settings/qPrefDiveComputer.h \ |