Commit 41ae241c authored by Andrew McCann's avatar Andrew McCann
Browse files

OSX: Kdelibs4ConfigMigrator needs to happen after App object is created.

Summary: Calling migrator before the application object was created caused qt platform not to load on OSX, resulting in segfault/abort.

Test Plan:
Verify no longer segfaults on OSX.

@kfunk, I presume that the ConfigMigrator can run after the Application object is created?

Reviewers: kfunk, #kdevelop

Reviewed By: kfunk, #kdevelop

Subscribers: kfunk, kdevelop-devel

Projects: #kdevelop

Differential Revision: https://phabricator.kde.org/D624
parent afa85b7d
......@@ -246,11 +246,6 @@ int main( int argc, char *argv[] )
qputenv("QT_ENABLE_REGEXP_JIT", "0");
}
Kdelibs4ConfigMigrator migrator(QStringLiteral("kdevelop"));
migrator.setConfigFiles({QStringLiteral("kdeveloprc")});
migrator.setUiFiles({QStringLiteral("kdevelopui.rc")});
migrator.migrate();
// Don't show any debug output by default.
// If you need to enable additional logging for debugging use a rules file
// as explained in the QLoggingCategory documentation:
......@@ -365,6 +360,11 @@ int main( int argc, char *argv[] )
KDevelopApplication app(argc, argv);
Kdelibs4ConfigMigrator migrator(QStringLiteral("kdevelop"));
migrator.setConfigFiles({QStringLiteral("kdeveloprc")});
migrator.setUiFiles({QStringLiteral("kdevelopui.rc")});
migrator.migrate();
// High DPI support
app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment