alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove Qt version check

Browse Source 
Now that Qt 5.10 is the minimum required version
This commit is contained in:
Albert Astals Cid 2019-01-07 00:35:45 +01:00
parent a9f8c1eacc
commit 39aa628e17
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/declarativeimports/core/iconitem.cpp
View File

@ -67,11 +67,6 @@ 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);
@ -672,10 +667,8 @@ 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();
}

2
src/plasmaquick/dialog.cpp
View File

@ -1365,10 +1365,8 @@ void Dialog::setVisible(bool visible)
d->mainItem->setVisible(true);
}
#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 {