Commit d53aea4f authored by Laurent Montel's avatar Laurent Montel
Browse files

Fix path against qt6/qt5

parent b55d3285
Pipeline #150148 passed with stage
in 11 minutes and 39 seconds
......@@ -120,8 +120,9 @@ InteractiveConsole::InteractiveConsole(ConsoleMode mode, QWidget *parent)
editorLayout->addWidget(toolBar);
auto tryLoadingKatePart = [=]() -> KTextEditor::Document * {
const auto loadResult = KPluginFactory::instantiatePlugin<KTextEditor::Document>(KPluginMetaData(QStringLiteral("kf5/parts/katepart")), this);
const auto loadResult =
KPluginFactory::instantiatePlugin<KTextEditor::Document>(KPluginMetaData(QStringLiteral("kf" QT_STRINGIFY(QT_VERSION_MAJOR) "/parts/katepart")),
this);
if (!loadResult) {
qWarning() << "Error loading katepart plugin:" << loadResult.errorString;
return nullptr;
......
......@@ -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: {
......
......@@ -28,7 +28,9 @@ namespace KFI
{
CViewer::CViewer()
{
const auto result = KPluginFactory::instantiatePlugin<KParts::ReadOnlyPart>(KPluginMetaData(QStringLiteral("kf5/parts/kfontviewpart")), this);
const auto result =
KPluginFactory::instantiatePlugin<KParts::ReadOnlyPart>(KPluginMetaData(QStringLiteral("kf" QT_STRINGIFY(QT_VERSION_MAJOR) "/parts/kfontviewpart")),
this);
if (!result) {
qCWarning(KFONTVIEW_DEBUG) << "Error loading kfontviewpart:" << result.errorString;
......
Supports Markdown
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