Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
2b2784e5
Commit
2b2784e5
authored
Feb 21, 2017
by
Don Gagne
Committed by
GitHub
Feb 21, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4590 from DonLakeFlyer/Settings
Settings fixes
parents
12ac1893
23df58ce
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
SettingsFact.cc
src/FactSystem/SettingsFact.cc
+1
-1
VideoSettings.cc
src/Settings/VideoSettings.cc
+2
-2
VideoSettings.h
src/Settings/VideoSettings.h
+1
-1
No files found.
src/FactSystem/SettingsFact.cc
View file @
2b2784e5
...
@@ -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
)
...
...
src/Settings/VideoSettings.cc
View file @
2b2784e5
...
@@ -12,10 +12,10 @@
...
@@ -12,10 +12,10 @@
#include <QQmlEngine>
#include <QQmlEngine>
#include <QtQml>
#include <QtQml>
const
char
*
VideoSettings
::
V
ideoSettingsGroupName
=
"video"
;
const
char
*
VideoSettings
::
v
ideoSettingsGroupName
=
"video"
;
VideoSettings
::
VideoSettings
(
QObject
*
parent
)
VideoSettings
::
VideoSettings
(
QObject
*
parent
)
:
SettingsGroup
(
V
ideoSettingsGroupName
,
QString
()
/* root settings group */
,
parent
)
:
SettingsGroup
(
v
ideoSettingsGroupName
,
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"
);
...
...
src/Settings/VideoSettings.h
View file @
2b2784e5
...
@@ -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
*
V
ideoSettingsGroupName
;
static
const
char
*
v
ideoSettingsGroupName
;
private:
private:
};
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment