File 0001-Revert-Remove-Qt-version-check.patch of Package plasma-framework

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Revert-Remove-Qt-version-check.patch of Package plasma-framework (Revision 0013a33e2f1ce3ca8f5d0da2616aef6d)

Currently displaying revision 0013a33e2f1ce3ca8f5d0da2616aef6d , Show latest

From 39aa628e17145ca250458e20ae922c3bd0e4e9c6 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Mon, 7 Jan 2019 00:35:45 +0100
Subject: Remove Qt version check

Now that Qt 5.10 is the minimum required version
---
 src/declarativeimports/core/iconitem.cpp | 7 -------
 src/plasmaquick/dialog.cpp               | 2 --
 2 files changed, 9 deletions(-)

Reverted and rebased by Antonio Larrosa <alarrosa@suse.com> so Qt 5.9 is
still supported

diff --git a/src/declarativeimports/core/iconitem.cpp b/src/declarativeimports/core/iconitem.cpp
index 70baa88..fd46f6d 100644
--- a/src/declarativeimports/core/iconitem.cpp
+++ b/src/declarativeimports/core/iconitem.cpp
@@ -67,6 +67,11 @@ IconItem::IconItem(QQuickItem *parent)
     connect(KIconLoader::global(), &KIconLoader::iconLoaderSettingsChanged,
             this, &IconItem::updateImplicitSize);
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
+    connect(this, &QQuickItem::enabledChanged,
+            this, &IconItem::onEnabledChanged);
+#endif
+
     connect(this, &IconItem::implicitWidthChanged, this, &IconItem::implicitWidthChanged2);
     connect(this, &IconItem::implicitHeightChanged, this, &IconItem::implicitHeightChanged2);
 
@@ -667,8 +672,10 @@ void IconItem::itemChange(ItemChange change, const ItemChangeData &value)
 {
     if (change == ItemVisibleHasChanged && value.boolValue) {
         m_blockNextAnimation = true;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
     } else if (change == ItemEnabledHasChanged) {
         onEnabledChanged();
+#endif
     } else if (change == ItemSceneChange && value.window) {
         schedulePixmapUpdate();
     }
diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
index 46f4cec..4b7d770 100644
--- a/src/plasmaquick/dialog.cpp
+++ b/src/plasmaquick/dialog.cpp
@@ -1365,8 +1365,10 @@ void Dialog::setVisible(bool visible)
             setPosition(popupPosition(d->visualParent, size()));
         }
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
         // Bug 381242: Qt remembers minimize state and re-applies it when showing
         setWindowStates(windowStates() & ~Qt::WindowMinimized);
+#endif
         QQuickWindow::setVisible(visible);
         //signal will be emitted and proxied from the QQuickWindow code
     } else {
-- 
cgit v1.1

Places

File 0001-Revert-Remove-Qt-version-check.patch of Package plasma-framework (Revision 0013a33e2f1ce3ca8f5d0da2616aef6d)

Places