Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
5274d608
Commit
5274d608
authored
Nov 01, 2019
by
Jean-Baptiste Mardelle
Browse files
Fix opengl modes incorrectly applied on windows
parent
8d8887b5
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/main.cpp
View file @
5274d608
...
...
@@ -64,12 +64,12 @@ int main(int argc, char *argv[])
Logger
::
init
();
QCoreApplication
::
setAttribute
(
Qt
::
AA_UseHighDpiPixmaps
);
QCoreApplication
::
setAttribute
(
Qt
::
AA_ShareOpenGLContexts
,
true
);
QApplication
app
(
argc
,
argv
);
KSharedConfigPtr
config
=
KSharedConfig
::
openConfig
();
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
QCoreApplication
::
setAttribute
(
Qt
::
AA_X11InitThreads
);
#elif defined(Q_OS_WIN)
KConfigGroup
grp1
(
config
,
"misc"
);
KSharedConfigPtr
configWin
=
KSharedConfig
::
openConfig
(
"kdenliverc"
);
KConfigGroup
grp1
(
configWin
,
"misc"
);
if
(
grp1
.
exists
())
{
int
glMode
=
grp1
.
readEntry
(
"opengl_backend"
,
0
);
if
(
glMode
>
0
)
{
...
...
@@ -77,11 +77,11 @@ int main(int argc, char *argv[])
}
}
#endif
QApplication
app
(
argc
,
argv
);
app
.
setApplicationName
(
QStringLiteral
(
"kdenlive"
));
app
.
setOrganizationDomain
(
QStringLiteral
(
"kde.org"
));
app
.
setWindowIcon
(
QIcon
(
QStringLiteral
(
":/pics/kdenlive.png"
)));
KLocalizedString
::
setApplicationDomain
(
"kdenlive"
);
#ifdef Q_OS_WIN
qputenv
(
"KDE_FORK_SLAVES"
,
"1"
);
QString
path
=
qApp
->
applicationDirPath
()
+
QLatin1Char
(
';'
)
+
qgetenv
(
"PATH"
);
...
...
@@ -105,6 +105,7 @@ int main(int argc, char *argv[])
}
}
#endif
KSharedConfigPtr
config
=
KSharedConfig
::
openConfig
();
KConfigGroup
grp
(
config
,
"unmanaged"
);
if
(
!
grp
.
exists
())
{
QProcessEnvironment
env
=
QProcessEnvironment
::
systemEnvironment
();
...
...
Write
Preview
Supports
Markdown
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