diff --git a/interactiveconsole/interactiveconsole.cpp b/interactiveconsole/interactiveconsole.cpp index b78481d56..24865c89e 100644 --- a/interactiveconsole/interactiveconsole.cpp +++ b/interactiveconsole/interactiveconsole.cpp @@ -120,8 +120,9 @@ InteractiveConsole::InteractiveConsole(ConsoleMode mode, QWidget *parent) editorLayout->addWidget(toolBar); auto tryLoadingKatePart = [=]() -> KTextEditor::Document * { - const auto loadResult = KPluginFactory::instantiatePlugin(KPluginMetaData(QStringLiteral("kf5/parts/katepart")), this); - + const auto loadResult = + KPluginFactory::instantiatePlugin(KPluginMetaData(QStringLiteral("kf" QT_STRINGIFY(QT_VERSION_MAJOR) "/parts/katepart")), + this); if (!loadResult) { qWarning() << "Error loading katepart plugin:" << loadResult.errorString; return nullptr; diff --git a/kcms/formats/localelistmodel.cpp b/kcms/formats/localelistmodel.cpp index e7418ed70..598c190f0 100644 --- a/kcms/formats/localelistmodel.cpp +++ b/kcms/formats/localelistmodel.cpp @@ -57,7 +57,8 @@ QVariant LocaleListModel::data(const QModelIndex &index, int role) const if (split.count() > 1) { flagCode = split[1].toLower(); } - auto flagIconPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kf5/locale/countries/%1/flag.png").arg(flagCode)); + auto flagIconPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, + QStringLiteral("kf" QT_STRINGIFY(QT_VERSION_MAJOR) "/locale/countries/%1/flag.png").arg(flagCode)); return flagIconPath; } case DisplayName: { diff --git a/kcms/kfontinst/apps/Viewer.cpp b/kcms/kfontinst/apps/Viewer.cpp index 9ad644d10..2e4e6557f 100644 --- a/kcms/kfontinst/apps/Viewer.cpp +++ b/kcms/kfontinst/apps/Viewer.cpp @@ -28,7 +28,9 @@ namespace KFI { CViewer::CViewer() { - const auto result = KPluginFactory::instantiatePlugin(KPluginMetaData(QStringLiteral("kf5/parts/kfontviewpart")), this); + const auto result = + KPluginFactory::instantiatePlugin(KPluginMetaData(QStringLiteral("kf" QT_STRINGIFY(QT_VERSION_MAJOR) "/parts/kfontviewpart")), + this); if (!result) { qCWarning(KFONTVIEW_DEBUG) << "Error loading kfontviewpart:" << result.errorString;