Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
87bff7eb
Commit
87bff7eb
authored
Apr 20, 2018
by
Jan Möbius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'compatProfileDefault' into 'master'
Compat profile default See merge request
!83
parents
287af45b
b752b21a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
common/GlobalOptions.cc
common/GlobalOptions.cc
+3
-3
No files found.
common/GlobalOptions.cc
View file @
87bff7eb
...
...
@@ -405,7 +405,7 @@ bool coreProfile( ) {
if
(
profileOverride_
)
return
coreProfile_
;
else
return
OpenFlipperSettings
().
value
(
"Core/OpenGL/CoreProfile"
,
tru
e
).
toBool
();
return
OpenFlipperSettings
().
value
(
"Core/OpenGL/CoreProfile"
,
fals
e
).
toBool
();
}
/// get opengl version setting
...
...
@@ -415,8 +415,8 @@ QPair<int,int> glVersion(){
else
{
// unfortunately QVariant cant store QPair directly, we could try std::pair but its good for now
int
major
=
OpenFlipperSettings
().
value
(
"Core/OpenGL/VersionMajor"
,
4
).
value
<
int
>
();
int
minor
=
OpenFlipperSettings
().
value
(
"Core/OpenGL/VersionMinor"
,
6
).
value
<
int
>
();
int
major
=
OpenFlipperSettings
().
value
(
"Core/OpenGL/VersionMajor"
,
1
).
value
<
int
>
();
int
minor
=
OpenFlipperSettings
().
value
(
"Core/OpenGL/VersionMinor"
,
0
).
value
<
int
>
();
return
QPair
<
int
,
int
>
(
major
,
minor
);
}
}
...
...
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