Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Elisa
Commits
e0971a2e
Commit
e0971a2e
authored
Sep 21, 2022
by
Nate Graham
Browse files
Port away from KQuickAddons::QtQuickSettings::init()
Do what it does directly instead.
parent
746555f1
Pipeline
#235398
canceled with stage
in 5 minutes and 23 seconds
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
src/main.cpp
View file @
e0971a2e
...
...
@@ -16,7 +16,6 @@
#if KF5Declarative_FOUND
#include
<KDeclarative/KDeclarative>
#include
<KQuickAddons/QtQuickSettings>
#endif
#include
<KLocalizedString>
...
...
@@ -34,6 +33,7 @@
#include
<QApplication>
#include
<QCommandLineParser>
#include
<QStandardPaths>
#include
<QSurfaceFormat>
#include
<QDir>
#include
<QQmlApplicationEngine>
...
...
@@ -59,6 +59,10 @@ int __attribute__((visibility("default"))) main(int argc, char *argv[])
int
main
(
int
argc
,
char
*
argv
[])
#endif
{
auto
format
=
QSurfaceFormat
::
defaultFormat
();
format
.
setOption
(
QSurfaceFormat
::
ResetNotification
);
QSurfaceFormat
::
setDefaultFormat
(
format
);
#if defined Q_OS_ANDROID
if
(
argc
>
1
&&
strcmp
(
argv
[
1
],
"-service"
)
==
0
){
QAndroidService
app
(
argc
,
argv
);
...
...
@@ -85,10 +89,6 @@ int main(int argc, char *argv[])
QApplication
::
setStyle
(
QStringLiteral
(
"breeze"
));
#endif
#if KF5Declarative_FOUND
KQuickAddons
::
QtQuickSettings
::
init
();
#endif
KLocalizedString
::
setApplicationDomain
(
"elisa"
);
#if Qt5AndroidExtras_FOUND
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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