diff --git a/applets/kicker/plugin/actionlist.cpp b/applets/kicker/plugin/actionlist.cpp --- a/applets/kicker/plugin/actionlist.cpp +++ b/applets/kicker/plugin/actionlist.cpp @@ -251,7 +251,10 @@ resultIt = results.begin(); while (list.count() < 6 && resultIt != results.end()) { - const QString resource = (*resultIt).resource(); + QString resource = (*resultIt).resource(); + if (QDir::isAbsolutePath(resource)) { + resource = QUrl::fromLocalFile(resource).toString(); + } ++resultIt; const QUrl url(resource); diff --git a/applets/kicker/plugin/kastatsfavoritesmodel.cpp b/applets/kicker/plugin/kastatsfavoritesmodel.cpp --- a/applets/kicker/plugin/kastatsfavoritesmodel.cpp +++ b/applets/kicker/plugin/kastatsfavoritesmodel.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -158,7 +159,7 @@ return SP(new ContactEntry(q, resource)); } else if (agent == AGENT_DOCUMENTS) { - if (resource.startsWith(QLatin1String("/"))) { + if (QDir::isAbsolutePath(resource)) { return SP(new FileEntry(q, QUrl::fromLocalFile(resource))); } else { return SP(new FileEntry(q, QUrl(resource))); @@ -271,7 +272,7 @@ { // We want even files to have a proper URL const auto resource = - _resource.startsWith(QLatin1Char('/')) ? QUrl::fromLocalFile(_resource).toString() : _resource; + QDir::isAbsolutePath(_resource) ? QUrl::fromLocalFile(_resource).toString() : _resource; qCDebug(KICKER_DEBUG) << "Adding result" << resource << "already present?" << m_itemEntries.contains(resource); diff --git a/applets/taskmanager/plugin/backend.cpp b/applets/taskmanager/plugin/backend.cpp --- a/applets/taskmanager/plugin/backend.cpp +++ b/applets/taskmanager/plugin/backend.cpp @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -318,7 +319,10 @@ int actionCount = 0; while (actionCount < 5 && resultIt != results.end()) { - const QString resource = (*resultIt).resource(); + QString resource = (*resultIt).resource(); + if (QDir::isAbsolutePath(resource)) { + resource = QUrl::fromLocalFile(resource).toString(); + } ++resultIt; const QUrl url(resource); diff --git a/kcms/desktoptheme/kcm.cpp b/kcms/desktoptheme/kcm.cpp --- a/kcms/desktoptheme/kcm.cpp +++ b/kcms/desktoptheme/kcm.cpp @@ -52,10 +52,6 @@ , m_defaultTheme(new Plasma::Theme(this)) , m_haveThemeExplorerInstalled(false) { - //This flag seems to be needed in order for QQuickWidget to work - //see https://bugreports.qt-project.org/browse/QTBUG-40765 - //also, it seems to work only if set in the kcm, not in the systemsettings' main - qApp->setAttribute(Qt::AA_DontCreateNativeWidgetSiblings); qmlRegisterType(); KAboutData* about = new KAboutData(QStringLiteral("kcm_desktoptheme"), i18n("Plasma Style"), diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp --- a/kcms/fonts/fonts.cpp +++ b/kcms/fonts/fonts.cpp @@ -468,7 +468,6 @@ : KQuickAddons::ConfigModule(parent, args) , m_fontAASettings(new FontAASettings(this)) { - qApp->setAttribute(Qt::AA_DontCreateNativeWidgetSiblings); KAboutData* about = new KAboutData("kcm_fonts", i18n("Fonts"), "0.1", QString(), KAboutLicense::LGPL); about->addAuthor(i18n("Antonis Tsiapaliokas"), QString(), "antonis.tsiapaliokas@kde.org"); diff --git a/kcms/lookandfeel/kcm.cpp b/kcms/lookandfeel/kcm.cpp --- a/kcms/lookandfeel/kcm.cpp +++ b/kcms/lookandfeel/kcm.cpp @@ -67,10 +67,6 @@ , m_resetDefaultLayout(false) , m_applyWindowDecoration(true) { - //This flag seems to be needed in order for QQuickWidget to work - //see https://bugreports.qt-project.org/browse/QTBUG-40765 - //also, it seems to work only if set in the kcm, not in the systemsettings' main - qApp->setAttribute(Qt::AA_DontCreateNativeWidgetSiblings); qmlRegisterType(); qmlRegisterType(); KAboutData* about = new KAboutData(QStringLiteral("kcm_lookandfeel"), i18n("Global Theme"),