[Krunner] Remove the ginormous clear button in Krunner

Fix moc include

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.16)
 
 project(plasma-workspace)
-set(PROJECT_VERSION "5.25.90")
+set(PROJECT_VERSION "5.26.80")
 set(PROJECT_VERSION_MAJOR 5)
 
 set(QT_MIN_VERSION "5.15.2")

applets/kicker/plugin/appentry.cpp

@@ -133,9 +133,8 @@ AppEntry::AppEntry(AbstractModel *owner, KService::Ptr service, NameFormat nameF
     : AbstractEntry(owner)
     , m_service(service)
 {
-    if (m_service) {
-        init(nameFormat);
-    }
+    Q_ASSERT(service);
+    init(nameFormat);
 }
 
 AppEntry::AppEntry(AbstractModel *owner, const QString &id)
@@ -158,8 +157,11 @@ AppEntry::AppEntry(AbstractModel *owner, const QString &id)
     } else {
         m_service = KService::serviceByStorageId(id);
     }
+    if (!m_service) {
+        m_service = new KService(QString());
+    }
 
-    if (m_service) {
+    if (m_service->isValid()) {
         init((NameFormat)owner->rootModel()->property("appNameFormat").toInt());
     }
 }
@@ -177,7 +179,7 @@ void AppEntry::init(NameFormat nameFormat)
 
 bool AppEntry::isValid() const
 {
-    return m_service;
+    return m_service->isValid();
 }
 
 QIcon AppEntry::icon() const

applets/notifications/package/contents/ui/global/Globals.qml

@@ -169,7 +169,7 @@ QtObject {
     // Make it wider when on the top or the bottom center, since there's more horizontal
     // space available without looking weird
     // On mobile however we don't really want to have larger notifications
-    property int popupWidth: (popupLocation & Qt.AlignHCenter) && !Kirigami.Settings.isMobile ? PlasmaCore.Units.gridUnit * 22 : PlasmaCore.Units.gridUnit * 18
+    property int popupWidth:818  // (popupLocation & Qt.AlignHCenter) && !Kirigami.Settings.isMobile ? PlasmaCore.Units.gridUnit * 22 : PlasmaCore.Units.gridUnit * 18
     property int popupEdgeDistance: PlasmaCore.Units.largeSpacing * 2
     // Reduce spacing between popups when centered so the stack doesn't intrude into the
     // view as much

kcms/colors/colors.cpp

@@ -445,9 +445,9 @@ void KCMColors::applyWallpaperAccentColor()
 
 void KCMColors::wallpaperAccentColorArrivedSlot(QDBusPendingCallWatcher *call)
 {
-    QDBusPendingReply<uint> reply = *call;
+    QDBusPendingReply<QString> reply = *call;
     if (!reply.isError()) {
-        setAccentColor(QColor::fromRgba(reply.value()));
+        setAccentColor(QColor(reply.value()));
     }
     call->deleteLater();
 }

klipper/clipboardjob.cpp

@@ -16,7 +16,7 @@
 #include <QIcon>
 #include <QtConcurrent>
 
-#include <prison/Prison>
+#include <Prison/Prison>
 
 const static QString s_iconKey = QStringLiteral("icon");
 const static QString s_previewKey = QStringLiteral("preview");

klipper/klipper.cpp

@@ -47,11 +47,7 @@
 #include "klipperpopup.h"
 #include "klippersettings.h"
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 #include <Prison/Prison>
-#else
-#include <prison/Prison>
-#endif
 
 #include <config-X11.h>
 #if HAVE_X11

krunner/qml/RunCommand.qml

@@ -68,13 +68,14 @@ ColumnLayout {
         Layout.alignment: Qt.AlignTop
         PlasmaComponents3.ToolButton {
             icon.name: "configure"
+            visible:false
             onClicked: {
                 runnerWindow.visible = false
                 runnerWindow.displayConfiguration()
             }
             Accessible.name: i18n("Configure")
             Accessible.description: i18n("Configure KRunner Behavior")
-            visible: KCMShell.authorize("kcm_krunnersettings.desktop").length > 0
+
             PlasmaComponents3.ToolTip {
                 text: i18n("Configure KRunner…")
             }
@@ -83,8 +84,8 @@ ColumnLayout {
             id: queryField
             property bool allowCompletion: false
 
-            Layout.minimumWidth: PlasmaCore.Units.gridUnit * 25
-            Layout.maximumWidth: PlasmaCore.Units.gridUnit * 25
+            clearButtonShown: false
+            Layout.minimumWidth: 818
 
             activeFocusOnPress: true
             placeholderText: results.runnerName ? i18nc("Textfield placeholder text, query specific KRunner plugin",
@@ -219,7 +220,7 @@ ColumnLayout {
             }
         }
         PlasmaComponents3.ToolButton {
-            visible: runnerWindow.helpEnabled
+            visible: false
             checkable: true
             checked: root.query.startsWith("?")
             // Reset if out quers starts with "?", otherwise set it to "?"
@@ -330,9 +331,9 @@ ColumnLayout {
                     currentIndex = 0;
                 }
             }
-            Keys.onReturnPressed: runCurrentIndex(event)
-            Keys.onEnterPressed: runCurrentIndex(event)
-            
+            Keys.onReturnPressed: runCurrentIndex()
+            Keys.onEnterPressed: runCurrentIndex()
+
             Keys.onTabPressed: {
                 if (currentIndex == listView.count-1) {
                     listView.nextItemInFocusChain(true).forceActiveFocus();
@@ -367,7 +368,7 @@ ColumnLayout {
                     queryField.focus = true;
                 }
             }
-  
+
             Keys.onUpPressed: decrementCurrentIndex()
             Keys.onDownPressed: incrementCurrentIndex()
 

libtaskmanager/declarative/CMakeLists.txt

@@ -35,13 +35,15 @@ target_link_libraries(taskmanagerplugin Qt::Qml Qt::GuiPrivate
                                         KF5::I18n
                                         Qt::WaylandClient
                                         Wayland::Client)
-if (${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL "GLESv2")
-    target_link_libraries(taskmanagerplugin Qt5::Gui_GLESv2)
-elseif(TARGET Qt5::Gui_GL)
-    target_link_libraries(taskmanagerplugin Qt5::Gui_GL)
-endif()
-if (TARGET Qt5::Gui_EGL)
-    target_link_libraries(taskmanagerplugin Qt5::Gui_EGL)
+if (QT_MAJOR_VERSION EQUAL "5")
+    if (${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL "GLESv2")
+        target_link_libraries(taskmanagerplugin Qt5::Gui_GLESv2)
+    elseif(TARGET Qt5::Gui_GL)
+        target_link_libraries(taskmanagerplugin Qt5::Gui_GL)
+    endif()
+    if (TARGET Qt5::Gui_EGL)
+        target_link_libraries(taskmanagerplugin Qt5::Gui_EGL)
+    endif()
 endif()
 
 if(TARGET K::KPipeWire)