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
8e83e199
Commit
8e83e199
authored
Apr 10, 2018
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Release build fixes
parent
bc319fa4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
6 deletions
+5
-6
QGCApplication.cc
src/QGCApplication.cc
+3
-2
QGCApplication.h
src/QGCApplication.h
+1
-1
main.cc
src/main.cc
+1
-3
No files found.
src/QGCApplication.cc
View file @
8e83e199
...
@@ -138,7 +138,7 @@ static QObject* qgroundcontrolQmlGlobalSingletonFactory(QQmlEngine*, QJSEngine*)
...
@@ -138,7 +138,7 @@ static QObject* qgroundcontrolQmlGlobalSingletonFactory(QQmlEngine*, QJSEngine*)
return
qmlGlobal
;
return
qmlGlobal
;
}
}
QGCApplication
::
QGCApplication
(
int
&
argc
,
char
*
argv
[],
bool
logOutput
,
bool
unitTesting
)
QGCApplication
::
QGCApplication
(
int
&
argc
,
char
*
argv
[],
bool
unitTesting
)
#ifdef __mobile__
#ifdef __mobile__
:
QGuiApplication
(
argc
,
argv
)
:
QGuiApplication
(
argc
,
argv
)
,
_qmlAppEngine
(
NULL
)
,
_qmlAppEngine
(
NULL
)
...
@@ -146,7 +146,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool logOutput, bool uni
...
@@ -146,7 +146,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool logOutput, bool uni
:
QApplication
(
argc
,
argv
)
:
QApplication
(
argc
,
argv
)
#endif
#endif
,
_runningUnitTests
(
unitTesting
)
,
_runningUnitTests
(
unitTesting
)
,
_logOutput
(
logOutput
)
,
_logOutput
(
false
)
,
_fakeMobile
(
false
)
,
_fakeMobile
(
false
)
,
_settingsUpgraded
(
false
)
,
_settingsUpgraded
(
false
)
#ifdef QT_DEBUG
#ifdef QT_DEBUG
...
@@ -216,6 +216,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool logOutput, bool uni
...
@@ -216,6 +216,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool logOutput, bool uni
{
"--clear-settings"
,
&
fClearSettingsOptions
,
NULL
},
{
"--clear-settings"
,
&
fClearSettingsOptions
,
NULL
},
{
"--logging"
,
&
logging
,
&
loggingOptions
},
{
"--logging"
,
&
logging
,
&
loggingOptions
},
{
"--fake-mobile"
,
&
_fakeMobile
,
NULL
},
{
"--fake-mobile"
,
&
_fakeMobile
,
NULL
},
{
"--log-output"
,
&
_logOutput
,
NULL
},
#ifdef QT_DEBUG
#ifdef QT_DEBUG
{
"--test-high-dpi"
,
&
_testHighDPI
,
NULL
},
{
"--test-high-dpi"
,
&
_testHighDPI
,
NULL
},
#endif
#endif
...
...
src/QGCApplication.h
View file @
8e83e199
...
@@ -60,7 +60,7 @@ class QGCApplication : public
...
@@ -60,7 +60,7 @@ class QGCApplication : public
Q_OBJECT
Q_OBJECT
public:
public:
QGCApplication
(
int
&
argc
,
char
*
argv
[],
bool
logOutput
,
bool
unitTesting
);
QGCApplication
(
int
&
argc
,
char
*
argv
[],
bool
unitTesting
);
~
QGCApplication
();
~
QGCApplication
();
/// @brief Sets the persistent flag to delete all settings the next time QGroundControl is started.
/// @brief Sets the persistent flag to delete all settings the next time QGroundControl is started.
...
...
src/main.cc
View file @
8e83e199
...
@@ -176,14 +176,12 @@ int main(int argc, char *argv[])
...
@@ -176,14 +176,12 @@ int main(int argc, char *argv[])
bool
stressUnitTests
=
false
;
// Stress test unit tests
bool
stressUnitTests
=
false
;
// Stress test unit tests
bool
quietWindowsAsserts
=
false
;
// Don't let asserts pop dialog boxes
bool
quietWindowsAsserts
=
false
;
// Don't let asserts pop dialog boxes
bool
logOutput
=
false
;
// true: Log Qt debug output to file
QString
unitTestOptions
;
QString
unitTestOptions
;
CmdLineOpt_t
rgCmdLineOptions
[]
=
{
CmdLineOpt_t
rgCmdLineOptions
[]
=
{
{
"--unittest"
,
&
runUnitTests
,
&
unitTestOptions
},
{
"--unittest"
,
&
runUnitTests
,
&
unitTestOptions
},
{
"--unittest-stress"
,
&
stressUnitTests
,
&
unitTestOptions
},
{
"--unittest-stress"
,
&
stressUnitTests
,
&
unitTestOptions
},
{
"--no-windows-assert-ui"
,
&
quietWindowsAsserts
,
NULL
},
{
"--no-windows-assert-ui"
,
&
quietWindowsAsserts
,
NULL
},
{
"--log-output"
,
&
logOutput
,
NULL
},
// Add additional command line option flags here
// Add additional command line option flags here
};
};
...
@@ -208,7 +206,7 @@ int main(int argc, char *argv[])
...
@@ -208,7 +206,7 @@ int main(int argc, char *argv[])
#endif
#endif
#endif // QT_DEBUG
#endif // QT_DEBUG
QGCApplication
*
app
=
new
QGCApplication
(
argc
,
argv
,
logOutput
,
runUnitTests
);
QGCApplication
*
app
=
new
QGCApplication
(
argc
,
argv
,
runUnitTests
);
Q_CHECK_PTR
(
app
);
Q_CHECK_PTR
(
app
);
#ifdef Q_OS_LINUX
#ifdef Q_OS_LINUX
...
...
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