From ebc0e6d3f3edb90851295399dd22e081fe00a0c8 Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Mon, 20 Aug 2018 11:51:48 +0200 Subject: 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 --- packaging/ios/Subsurface-mobile.pro | 2 -- 1 file changed, 2 deletions(-) (limited to 'packaging') 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 \ -- cgit v1.2.3-70-g09d2