Commit 2b2784e5 authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #4590 from DonLakeFlyer/Settings

Settings fixes
parents 12ac1893 23df58ce
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
SettingsFact::SettingsFact(QObject* parent) SettingsFact::SettingsFact(QObject* parent)
: Fact(parent) : Fact(parent)
{ {
QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
} }
SettingsFact::SettingsFact(QString settingGroup, FactMetaData* metaData, QObject* parent) SettingsFact::SettingsFact(QString settingGroup, FactMetaData* metaData, QObject* parent)
......
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
#include <QQmlEngine> #include <QQmlEngine>
#include <QtQml> #include <QtQml>
const char* VideoSettings::VideoSettingsGroupName = "video"; const char* VideoSettings::videoSettingsGroupName = "video";
VideoSettings::VideoSettings(QObject* parent) VideoSettings::VideoSettings(QObject* parent)
: SettingsGroup(VideoSettingsGroupName, QString() /* root settings group */, parent) : SettingsGroup(videoSettingsGroupName, QString() /* root settings group */, parent)
{ {
QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership); QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
qmlRegisterUncreatableType<VideoSettings>("QGroundControl.SettingsManager", 1, 0, "VideoSettings", "Reference only"); qmlRegisterUncreatableType<VideoSettings>("QGroundControl.SettingsManager", 1, 0, "VideoSettings", "Reference only");
......
...@@ -19,7 +19,7 @@ class VideoSettings : public SettingsGroup ...@@ -19,7 +19,7 @@ class VideoSettings : public SettingsGroup
public: public:
VideoSettings(QObject* parent = NULL); VideoSettings(QObject* parent = NULL);
static const char* VideoSettingsGroupName; static const char* videoSettingsGroupName;
private: private:
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment