diff --git a/libkdecorations/kdecoration_plugins_p.cpp b/libkdecorations/kdecoration_plugins_p.cpp index 952baa3e92..c783b4c2e2 100644 --- a/libkdecorations/kdecoration_plugins_p.cpp +++ b/libkdecorations/kdecoration_plugins_p.cpp @@ -251,6 +251,8 @@ bool KDecorationPlugins::loadPlugin(QString nameStr) pluginStr = nameStr; // For clients in kdeartwork +#warning insertCatalog needs porting +#if KWIN_QT5_PORTING QString catalog = nameStr; catalog.replace("kwin3_", "kwin_"); KGlobal::locale()->insertCatalog(catalog); @@ -260,6 +262,7 @@ bool KDecorationPlugins::loadPlugin(QString nameStr) KGlobal::locale()->insertCatalog("kwin_clients"); // For clients in kdeartwork KGlobal::locale()->insertCatalog("kwin_art_clients"); +#endif old_library = oldLibrary; // save for delayed destroying old_fact = oldFactory; diff --git a/main.cpp b/main.cpp index 6c8e96691a..5304e0c4b7 100644 --- a/main.cpp +++ b/main.cpp @@ -546,9 +546,12 @@ KDE_EXPORT int kdemain(int argc, char * argv[]) ksmserver.resumeStartup(KWIN_NAME); KWin::SessionManager weAreIndeed; KWin::SessionSaveDoneHelper helper; +#warning insertCatalog needs porting +#if KWIN_QT5_PORTING KGlobal::locale()->insertCatalog("kwin_effects"); KGlobal::locale()->insertCatalog("kwin_scripts"); KGlobal::locale()->insertCatalog("kwin_scripting"); +#endif // Announce when KWIN_DIRECT_GL is set for above HACK if (qstrcmp(qgetenv("KWIN_DIRECT_GL"), "1") == 0)