Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
9fc5243e
Commit
9fc5243e
authored
Jul 18, 2017
by
Martin Schultz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
moved commandLine parsing prior to context creation
so core profile option is set properly
parent
c5943198
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
40 deletions
+23
-40
OpenFlipper.cc
OpenFlipper.cc
+23
-40
No files found.
OpenFlipper.cc
View file @
9fc5243e
...
...
@@ -472,15 +472,35 @@ int main(int argc, char **argv)
QApplication
app
(
argc
,
argv
);
#if QT_VERSION >= 0x050500
switch
(
parseCommandLine
(
parser
,
&
errorMessage
))
{
case
CommandLineOk
:
break
;
case
CommandLineError
:
fputs
(
qPrintable
(
errorMessage
),
stderr
);
fputs
(
"
\n\n
"
,
stderr
);
fputs
(
qPrintable
(
parser
.
helpText
()),
stderr
);
return
1
;
case
CommandLineVersionRequested
:
printf
(
"%s %s
\n
"
,
qPrintable
(
QCoreApplication
::
applicationName
()),
qPrintable
(
QCoreApplication
::
applicationVersion
()));
return
0
;
case
CommandLineHelpRequested
:
parser
.
showHelp
();
Q_UNREACHABLE
();
}
QSurfaceFormat
format
=
QSurfaceFormat
::
defaultFormat
();
format
.
setVersion
(
4
,
4
);
if
(
OpenFlipper
::
Options
::
coreProfile
())
{
format
.
setProfile
(
QSurfaceFormat
::
CoreProfile
);
}
else
{
format
.
setProfile
(
QSurfaceFormat
::
CompatibilityProfile
);
format
.
setOption
(
QSurfaceFormat
::
DeprecatedFunctions
);
}
if
(
OpenFlipper
::
Options
::
debug
())
format
.
setOption
(
format
.
options
()
|
QSurfaceFormat
::
DebugContext
);
...
...
@@ -517,25 +537,6 @@ int main(int argc, char **argv)
// create core ( this also reads the ini files )
Core
*
w
=
new
Core
(
);
switch
(
parseCommandLine
(
parser
,
&
errorMessage
))
{
case
CommandLineOk
:
break
;
case
CommandLineError
:
fputs
(
qPrintable
(
errorMessage
),
stderr
);
fputs
(
"
\n\n
"
,
stderr
);
fputs
(
qPrintable
(
parser
.
helpText
()),
stderr
);
delete
w
;
return
1
;
case
CommandLineVersionRequested
:
printf
(
"%s %s
\n
"
,
qPrintable
(
QCoreApplication
::
applicationName
()),
qPrintable
(
QCoreApplication
::
applicationVersion
()));
return
0
;
case
CommandLineHelpRequested
:
parser
.
showHelp
();
Q_UNREACHABLE
();
}
QString
tLang
=
OpenFlipperSettings
().
value
(
"Core/Language/Translation"
,
"en_US"
).
toString
();
if
(
tLang
==
"locale"
)
...
...
@@ -605,24 +606,6 @@ int main(int argc, char **argv)
// create widget ( this also reads the ini files )
Core
*
w
=
new
Core
(
);
switch
(
parseCommandLine
(
parser
,
&
errorMessage
))
{
case
CommandLineOk
:
break
;
case
CommandLineError
:
fputs
(
qPrintable
(
errorMessage
),
stderr
);
fputs
(
"
\n\n
"
,
stderr
);
fputs
(
qPrintable
(
parser
.
helpText
()),
stderr
);
delete
w
;
return
1
;
case
CommandLineVersionRequested
:
printf
(
"%s %s
\n
"
,
qPrintable
(
QCoreApplication
::
applicationName
()),
qPrintable
(
QCoreApplication
::
applicationVersion
()));
return
0
;
case
CommandLineHelpRequested
:
parser
.
showHelp
();
Q_UNREACHABLE
();
}
// After setting all Options from command line, build the real gui
w
->
init
();
...
...
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