qt5-5.15.7
This commit is contained in:
@@ -14,10 +14,10 @@
|
|||||||
<Archive sha1sum="401f694d16b58712a70c36845f7c5f474e4fd784" type="targz">https://github.com/qt/qtenginio/archive/v5.6.3.tar.gz</Archive>
|
<Archive sha1sum="401f694d16b58712a70c36845f7c5f474e4fd784" type="targz">https://github.com/qt/qtenginio/archive/v5.6.3.tar.gz</Archive>
|
||||||
<BuildDependencies>
|
<BuildDependencies>
|
||||||
<Dependency>libgcc</Dependency>
|
<Dependency>libgcc</Dependency>
|
||||||
<Dependency versionFrom="5.14.1">qt5-base-devel</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-base-devel</Dependency>
|
||||||
<Dependency versionFrom="5.14.1">qt5-declarative-devel</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-declarative-devel</Dependency>
|
||||||
<Dependency versionFrom="5.14.1">qt5-assistant-devel</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-assistant-devel</Dependency>
|
||||||
<Dependency versionFrom="5.14.1">qt5-sql-sqlite</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-sql-sqlite</Dependency>
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
<Patches>
|
<Patches>
|
||||||
<Patch>qtenginio-1.6.3-Qt-5.14.patch</Patch>
|
<Patch>qtenginio-1.6.3-Qt-5.14.patch</Patch>
|
||||||
@@ -28,8 +28,8 @@
|
|||||||
<Name>qt5-enginio</Name>
|
<Name>qt5-enginio</Name>
|
||||||
<RuntimeDependencies>
|
<RuntimeDependencies>
|
||||||
<Dependency>libgcc</Dependency>
|
<Dependency>libgcc</Dependency>
|
||||||
<Dependency versionFrom="5.14.1">qt5-base</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-base</Dependency>
|
||||||
<Dependency versionFrom="5.14.1">qt5-declarative</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-declarative</Dependency>
|
||||||
</RuntimeDependencies>
|
</RuntimeDependencies>
|
||||||
<Files>
|
<Files>
|
||||||
<Path fileType="library">/usr/lib</Path>
|
<Path fileType="library">/usr/lib</Path>
|
||||||
@@ -48,7 +48,7 @@
|
|||||||
<Path fileType="header">/usr/include/qt5/</Path>
|
<Path fileType="header">/usr/include/qt5/</Path>
|
||||||
</Files>
|
</Files>
|
||||||
<RuntimeDependencies>
|
<RuntimeDependencies>
|
||||||
<Dependency versionFrom="5.14.1">qt5-base-devel</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-base-devel</Dependency>
|
||||||
<Dependency release="current">qt5-enginio</Dependency>
|
<Dependency release="current">qt5-enginio</Dependency>
|
||||||
</RuntimeDependencies>
|
</RuntimeDependencies>
|
||||||
</Package>
|
</Package>
|
||||||
@@ -64,6 +64,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="19">
|
||||||
|
<Date>2020-12-21</Date>
|
||||||
|
<Version>5.6.3</Version>
|
||||||
|
<Comment>Rebuild for qt5.15.7</Comment>
|
||||||
|
<Name>Mustafa Cinasal</Name>
|
||||||
|
<Email>muscnsl@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="18">
|
<Update release="18">
|
||||||
<Date>2020-02-27</Date>
|
<Date>2020-02-27</Date>
|
||||||
<Version>5.6.3</Version>
|
<Version>5.6.3</Version>
|
||||||
|
|||||||
@@ -1,5 +1,128 @@
|
|||||||
|
diff --git a/src/imports/platform/widgets/qwidgetplatformmenu.cpp b/src/imports/platform/widgets/qwidgetplatformmenu.cpp
|
||||||
|
index e5fe734f7..e36922775 100644
|
||||||
|
--- a/src/imports/platform/widgets/qwidgetplatformmenu.cpp
|
||||||
|
+++ b/src/imports/platform/widgets/qwidgetplatformmenu.cpp
|
||||||
|
@@ -38,6 +38,7 @@
|
||||||
|
#include "qwidgetplatformmenuitem_p.h"
|
||||||
|
|
||||||
|
#include <QtGui/qwindow.h>
|
||||||
|
+#include <QtGui/private/qhighdpiscaling_p.h>
|
||||||
|
#include <QtWidgets/qmenu.h>
|
||||||
|
#include <QtWidgets/qaction.h>
|
||||||
|
|
||||||
|
@@ -145,7 +146,7 @@ void QWidgetPlatformMenu::showPopup(const QWindow *window, const QRect &targetRe
|
||||||
|
|
||||||
|
QPoint targetPos = targetRect.bottomLeft();
|
||||||
|
if (window)
|
||||||
|
- targetPos = window->mapToGlobal(targetPos);
|
||||||
|
+ targetPos = window->mapToGlobal(QHighDpi::fromNativeLocalPosition(targetPos, window));
|
||||||
|
|
||||||
|
const QWidgetPlatformMenuItem *widgetItem = qobject_cast<const QWidgetPlatformMenuItem *>(item);
|
||||||
|
m_menu->popup(targetPos, widgetItem ? widgetItem->action() : nullptr);
|
||||||
|
diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp
|
||||||
|
index 950e4e099..b81fbea0b 100644
|
||||||
|
--- a/src/quicktemplates2/qquickabstractbutton.cpp
|
||||||
|
+++ b/src/quicktemplates2/qquickabstractbutton.cpp
|
||||||
|
@@ -387,6 +387,17 @@ void QQuickAbstractButtonPrivate::itemImplicitHeightChanged(QQuickItem *item)
|
||||||
|
emit q->implicitIndicatorHeightChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
+void QQuickAbstractButtonPrivate::itemDestroyed(QQuickItem *item)
|
||||||
|
+{
|
||||||
|
+ Q_Q(QQuickAbstractButton);
|
||||||
|
+ QQuickControlPrivate::itemDestroyed(item);
|
||||||
|
+ if (item == indicator) {
|
||||||
|
+ indicator = nullptr;
|
||||||
|
+ emit q->implicitIndicatorWidthChanged();
|
||||||
|
+ emit q->implicitIndicatorHeightChanged();
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
QQuickAbstractButton *QQuickAbstractButtonPrivate::findCheckedButton() const
|
||||||
|
{
|
||||||
|
Q_Q(const QQuickAbstractButton);
|
||||||
|
@@ -1176,6 +1187,12 @@ QAccessible::Role QQuickAbstractButton::accessibleRole() const
|
||||||
|
}
|
||||||
|
return QAccessible::Button;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+void QQuickAbstractButton::accessiblePressAction()
|
||||||
|
+{
|
||||||
|
+ Q_D(QQuickAbstractButton);
|
||||||
|
+ d->trigger();
|
||||||
|
+}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
QT_END_NAMESPACE
|
||||||
|
diff --git a/src/quicktemplates2/qquickabstractbutton_p.h b/src/quicktemplates2/qquickabstractbutton_p.h
|
||||||
|
index 0fa48980e..ab66220d0 100644
|
||||||
|
--- a/src/quicktemplates2/qquickabstractbutton_p.h
|
||||||
|
+++ b/src/quicktemplates2/qquickabstractbutton_p.h
|
||||||
|
@@ -209,6 +209,7 @@ protected:
|
||||||
|
#if QT_CONFIG(accessibility)
|
||||||
|
void accessibilityActiveChanged(bool active) override;
|
||||||
|
QAccessible::Role accessibleRole() const override;
|
||||||
|
+ Q_INVOKABLE void accessiblePressAction();
|
||||||
|
#endif
|
||||||
|
|
||||||
|
private:
|
||||||
|
diff --git a/src/quicktemplates2/qquickabstractbutton_p_p.h b/src/quicktemplates2/qquickabstractbutton_p_p.h
|
||||||
|
index 9291c1a87..b729720f2 100644
|
||||||
|
--- a/src/quicktemplates2/qquickabstractbutton_p_p.h
|
||||||
|
+++ b/src/quicktemplates2/qquickabstractbutton_p_p.h
|
||||||
|
@@ -109,6 +109,7 @@ public:
|
||||||
|
|
||||||
|
void itemImplicitWidthChanged(QQuickItem *item) override;
|
||||||
|
void itemImplicitHeightChanged(QQuickItem *item) override;
|
||||||
|
+ void itemDestroyed(QQuickItem *item) override;
|
||||||
|
|
||||||
|
// copied from qabstractbutton.cpp
|
||||||
|
static const int AUTO_REPEAT_DELAY = 300;
|
||||||
|
diff --git a/src/quicktemplates2/qquickaction.cpp b/src/quicktemplates2/qquickaction.cpp
|
||||||
|
index 2041e7741..8610cdfae 100644
|
||||||
|
--- a/src/quicktemplates2/qquickaction.cpp
|
||||||
|
+++ b/src/quicktemplates2/qquickaction.cpp
|
||||||
|
@@ -145,7 +145,7 @@ int QQuickActionPrivate::ShortcutEntry::shortcutId() const
|
||||||
|
|
||||||
|
void QQuickActionPrivate::ShortcutEntry::grab(const QKeySequence &shortcut, bool enabled)
|
||||||
|
{
|
||||||
|
- if (shortcut.isEmpty())
|
||||||
|
+ if (shortcut.isEmpty() || m_shortcutId)
|
||||||
|
return;
|
||||||
|
|
||||||
|
Qt::ShortcutContext context = Qt::WindowShortcut; // TODO
|
||||||
|
diff --git a/src/quicktemplates2/qquickcontainer.cpp b/src/quicktemplates2/qquickcontainer.cpp
|
||||||
|
index f38c2b09c..6eed2a024 100644
|
||||||
|
--- a/src/quicktemplates2/qquickcontainer.cpp
|
||||||
|
+++ b/src/quicktemplates2/qquickcontainer.cpp
|
||||||
|
@@ -225,6 +225,7 @@ void QQuickContainerPrivate::cleanup()
|
||||||
|
QObject::disconnect(contentModel, &QQmlObjectModel::countChanged, q, &QQuickContainer::countChanged);
|
||||||
|
QObject::disconnect(contentModel, &QQmlObjectModel::childrenChanged, q, &QQuickContainer::contentChildrenChanged);
|
||||||
|
delete contentModel;
|
||||||
|
+ contentModel = nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
QQuickItem *QQuickContainerPrivate::itemAt(int index) const
|
||||||
|
@@ -436,7 +437,7 @@ void QQuickContainerPrivate::contentChildren_clear(QQmlListProperty<QQuickItem>
|
||||||
|
void QQuickContainerPrivate::updateContentWidth()
|
||||||
|
{
|
||||||
|
Q_Q(QQuickContainer);
|
||||||
|
- if (hasContentWidth || qFuzzyCompare(contentWidth, implicitContentWidth))
|
||||||
|
+ if (hasContentWidth || qFuzzyCompare(contentWidth, implicitContentWidth) || !contentModel)
|
||||||
|
return;
|
||||||
|
|
||||||
|
contentWidth = implicitContentWidth;
|
||||||
|
@@ -446,7 +447,7 @@ void QQuickContainerPrivate::updateContentWidth()
|
||||||
|
void QQuickContainerPrivate::updateContentHeight()
|
||||||
|
{
|
||||||
|
Q_Q(QQuickContainer);
|
||||||
|
- if (hasContentHeight || qFuzzyCompare(contentHeight, implicitContentHeight))
|
||||||
|
+ if (hasContentHeight || qFuzzyCompare(contentHeight, implicitContentHeight) || !contentModel)
|
||||||
|
return;
|
||||||
|
|
||||||
|
contentHeight = implicitContentHeight;
|
||||||
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
|
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
|
||||||
index bbbd0e622ad65ea40576ee74cd81082ce2450b12..1f4b47343c5b2a2c0d8efae64db460c567144f29 100644
|
index bbbd0e622..1f4b47343 100644
|
||||||
--- a/src/quicktemplates2/qquickcontrol.cpp
|
--- a/src/quicktemplates2/qquickcontrol.cpp
|
||||||
+++ b/src/quicktemplates2/qquickcontrol.cpp
|
+++ b/src/quicktemplates2/qquickcontrol.cpp
|
||||||
@@ -845,6 +845,13 @@ void QQuickControlPrivate::executeBackground(bool complete)
|
@@ -845,6 +845,13 @@ void QQuickControlPrivate::executeBackground(bool complete)
|
||||||
@@ -47,7 +170,7 @@ index bbbd0e622ad65ea40576ee74cd81082ce2450b12..1f4b47343c5b2a2c0d8efae64db460c5
|
|||||||
{
|
{
|
||||||
Q_Q(QQuickControl);
|
Q_Q(QQuickControl);
|
||||||
diff --git a/src/quicktemplates2/qquickcontrol_p_p.h b/src/quicktemplates2/qquickcontrol_p_p.h
|
diff --git a/src/quicktemplates2/qquickcontrol_p_p.h b/src/quicktemplates2/qquickcontrol_p_p.h
|
||||||
index 8e979079e0a8894712f4123ea173d0edb4915237..a6e624c911ad988b61571b2534cb540e3dcd2265 100644
|
index 8e979079e..a6e624c91 100644
|
||||||
--- a/src/quicktemplates2/qquickcontrol_p_p.h
|
--- a/src/quicktemplates2/qquickcontrol_p_p.h
|
||||||
+++ b/src/quicktemplates2/qquickcontrol_p_p.h
|
+++ b/src/quicktemplates2/qquickcontrol_p_p.h
|
||||||
@@ -173,6 +173,7 @@ public:
|
@@ -173,6 +173,7 @@ public:
|
||||||
@@ -58,8 +181,58 @@ index 8e979079e0a8894712f4123ea173d0edb4915237..a6e624c911ad988b61571b2534cb540e
|
|||||||
|
|
||||||
void updateBaselineOffset();
|
void updateBaselineOffset();
|
||||||
|
|
||||||
|
diff --git a/src/quicktemplates2/qquickdialogbuttonbox.cpp b/src/quicktemplates2/qquickdialogbuttonbox.cpp
|
||||||
|
index e6db14eb5..6197d1547 100644
|
||||||
|
--- a/src/quicktemplates2/qquickdialogbuttonbox.cpp
|
||||||
|
+++ b/src/quicktemplates2/qquickdialogbuttonbox.cpp
|
||||||
|
@@ -237,7 +237,7 @@ static QRectF alignedRect(Qt::LayoutDirection direction, Qt::Alignment alignment
|
||||||
|
void QQuickDialogButtonBoxPrivate::resizeContent()
|
||||||
|
{
|
||||||
|
Q_Q(QQuickDialogButtonBox);
|
||||||
|
- if (!contentItem)
|
||||||
|
+ if (!contentItem || !contentModel)
|
||||||
|
return;
|
||||||
|
|
||||||
|
QRectF geometry = q->boundingRect().adjusted(q->leftPadding(), q->topPadding(), -q->rightPadding(), -q->bottomPadding());
|
||||||
|
@@ -322,6 +322,9 @@ void QQuickDialogButtonBoxPrivate::updateLayout()
|
||||||
|
qreal QQuickDialogButtonBoxPrivate::getContentWidth() const
|
||||||
|
{
|
||||||
|
Q_Q(const QQuickDialogButtonBox);
|
||||||
|
+ if (!contentModel)
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
const int count = contentModel->count();
|
||||||
|
const qreal totalSpacing = qMax(0, count - 1) * spacing;
|
||||||
|
qreal totalWidth = totalSpacing;
|
||||||
|
@@ -341,6 +344,9 @@ qreal QQuickDialogButtonBoxPrivate::getContentWidth() const
|
||||||
|
qreal QQuickDialogButtonBoxPrivate::getContentHeight() const
|
||||||
|
{
|
||||||
|
Q_Q(const QQuickDialogButtonBox);
|
||||||
|
+ if (!contentModel)
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
const int count = contentModel->count();
|
||||||
|
qreal maxHeight = 0;
|
||||||
|
for (int i = 0; i < count; ++i) {
|
||||||
|
diff --git a/src/quicktemplates2/qquickoverlay.cpp b/src/quicktemplates2/qquickoverlay.cpp
|
||||||
|
index b8d417f29..c8cd142ae 100644
|
||||||
|
--- a/src/quicktemplates2/qquickoverlay.cpp
|
||||||
|
+++ b/src/quicktemplates2/qquickoverlay.cpp
|
||||||
|
@@ -399,8 +399,11 @@ void QQuickOverlay::itemChange(ItemChange change, const ItemChangeData &data)
|
||||||
|
Q_D(QQuickOverlay);
|
||||||
|
QQuickItem::itemChange(change, data);
|
||||||
|
|
||||||
|
- if (change == ItemChildAddedChange || change == ItemChildRemovedChange)
|
||||||
|
+ if (change == ItemChildAddedChange || change == ItemChildRemovedChange) {
|
||||||
|
setVisible(!d->allDrawers.isEmpty() || !childItems().isEmpty());
|
||||||
|
+ if (data.item->parent() == d->mouseGrabberPopup)
|
||||||
|
+ d->setMouseGrabberPopup(nullptr);
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
void QQuickOverlay::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
|
||||||
diff --git a/src/quicktemplates2/qquickscrollbar.cpp b/src/quicktemplates2/qquickscrollbar.cpp
|
diff --git a/src/quicktemplates2/qquickscrollbar.cpp b/src/quicktemplates2/qquickscrollbar.cpp
|
||||||
index 4e2f509db503bdbd307c2b293212c30997ce6911..1c4b308cd704075e09683689967f6dec389964ba 100644
|
index 4e2f509db..1c4b308cd 100644
|
||||||
--- a/src/quicktemplates2/qquickscrollbar.cpp
|
--- a/src/quicktemplates2/qquickscrollbar.cpp
|
||||||
+++ b/src/quicktemplates2/qquickscrollbar.cpp
|
+++ b/src/quicktemplates2/qquickscrollbar.cpp
|
||||||
@@ -797,6 +797,14 @@ void QQuickScrollBarAttachedPrivate::initHorizontal()
|
@@ -797,6 +797,14 @@ void QQuickScrollBarAttachedPrivate::initHorizontal()
|
||||||
@@ -88,7 +261,7 @@ index 4e2f509db503bdbd307c2b293212c30997ce6911..1c4b308cd704075e09683689967f6dec
|
|||||||
vertical->setSize(area->property("heightRatio").toReal());
|
vertical->setSize(area->property("heightRatio").toReal());
|
||||||
vertical->setPosition(area->property("yPosition").toReal());
|
vertical->setPosition(area->property("yPosition").toReal());
|
||||||
diff --git a/tests/auto/controls/data/tst_scrollview.qml b/tests/auto/controls/data/tst_scrollview.qml
|
diff --git a/tests/auto/controls/data/tst_scrollview.qml b/tests/auto/controls/data/tst_scrollview.qml
|
||||||
index 0e8b0835254a5099bda836dff11a3f541447e00a..cd4931184d06a555484885b5d568135aad06477d 100644
|
index 0e8b08352..cd4931184 100644
|
||||||
--- a/tests/auto/controls/data/tst_scrollview.qml
|
--- a/tests/auto/controls/data/tst_scrollview.qml
|
||||||
+++ b/tests/auto/controls/data/tst_scrollview.qml
|
+++ b/tests/auto/controls/data/tst_scrollview.qml
|
||||||
@@ -576,4 +576,51 @@ TestCase {
|
@@ -576,4 +576,51 @@ TestCase {
|
||||||
@@ -143,3 +316,166 @@ index 0e8b0835254a5099bda836dff11a3f541447e00a..cd4931184d06a555484885b5d568135a
|
|||||||
+ verify(horizontalScrollBar.active)
|
+ verify(horizontalScrollBar.active)
|
||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
|
diff --git a/tests/auto/controls/data/tst_switch.qml b/tests/auto/controls/data/tst_switch.qml
|
||||||
|
index b3fab41ca..10b6baa02 100644
|
||||||
|
--- a/tests/auto/controls/data/tst_switch.qml
|
||||||
|
+++ b/tests/auto/controls/data/tst_switch.qml
|
||||||
|
@@ -608,4 +608,27 @@ TestCase {
|
||||||
|
mouseClick(control.indicator)
|
||||||
|
verify(control.activeFocus)
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ Component {
|
||||||
|
+ id: deletionOrder1
|
||||||
|
+ Item {
|
||||||
|
+ Image { id: innerImage }
|
||||||
|
+ Switch { indicator: innerImage }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ Component {
|
||||||
|
+ id: deletionOrder2
|
||||||
|
+ Item {
|
||||||
|
+ Switch { indicator: innerImage }
|
||||||
|
+ Image { id: innerImage }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ function test_deletionOrder() {
|
||||||
|
+ var control1 = createTemporaryObject(deletionOrder1, testCase)
|
||||||
|
+ verify(control1)
|
||||||
|
+ var control2 = createTemporaryObject(deletionOrder2, testCase)
|
||||||
|
+ verify(control2)
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
diff --git a/tests/auto/qquickpopup/data/releaseAfterExitTransition.qml b/tests/auto/qquickpopup/data/releaseAfterExitTransition.qml
|
||||||
|
new file mode 100644
|
||||||
|
index 000000000..9e4598b9f
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/tests/auto/qquickpopup/data/releaseAfterExitTransition.qml
|
||||||
|
@@ -0,0 +1,78 @@
|
||||||
|
+/****************************************************************************
|
||||||
|
+**
|
||||||
|
+** Copyright (C) 2021 The Qt Company Ltd.
|
||||||
|
+** Contact: https://www.qt.io/licensing/
|
||||||
|
+**
|
||||||
|
+** This file is part of the test suite of the Qt Toolkit.
|
||||||
|
+**
|
||||||
|
+** $QT_BEGIN_LICENSE:BSD$
|
||||||
|
+** Commercial License Usage
|
||||||
|
+** Licensees holding valid commercial Qt licenses may use this file in
|
||||||
|
+** accordance with the commercial license agreement provided with the
|
||||||
|
+** Software or, alternatively, in accordance with the terms contained in
|
||||||
|
+** a written agreement between you and The Qt Company. For licensing terms
|
||||||
|
+** and conditions see https://www.qt.io/terms-conditions. For further
|
||||||
|
+** information use the contact form at https://www.qt.io/contact-us.
|
||||||
|
+**
|
||||||
|
+** BSD License Usage
|
||||||
|
+** Alternatively, you may use this file under the terms of the BSD license
|
||||||
|
+** as follows:
|
||||||
|
+**
|
||||||
|
+** "Redistribution and use in source and binary forms, with or without
|
||||||
|
+** modification, are permitted provided that the following conditions are
|
||||||
|
+** met:
|
||||||
|
+** * Redistributions of source code must retain the above copyright
|
||||||
|
+** notice, this list of conditions and the following disclaimer.
|
||||||
|
+** * Redistributions in binary form must reproduce the above copyright
|
||||||
|
+** notice, this list of conditions and the following disclaimer in
|
||||||
|
+** the documentation and/or other materials provided with the
|
||||||
|
+** distribution.
|
||||||
|
+** * Neither the name of The Qt Company Ltd nor the names of its
|
||||||
|
+** contributors may be used to endorse or promote products derived
|
||||||
|
+** from this software without specific prior written permission.
|
||||||
|
+**
|
||||||
|
+**
|
||||||
|
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
|
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||||
|
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||||
|
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||||
|
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||||
|
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
|
||||||
|
+**
|
||||||
|
+** $QT_END_LICENSE$
|
||||||
|
+**
|
||||||
|
+****************************************************************************/
|
||||||
|
+
|
||||||
|
+import QtQuick 2.15
|
||||||
|
+import QtQuick.Controls 2.15
|
||||||
|
+
|
||||||
|
+ApplicationWindow {
|
||||||
|
+ id: window
|
||||||
|
+ width: 400
|
||||||
|
+ height: 400
|
||||||
|
+ title: "releaseAfterExitTransition"
|
||||||
|
+
|
||||||
|
+ property alias popup: popup
|
||||||
|
+ property alias modalPopup: modalPopup
|
||||||
|
+
|
||||||
|
+ Popup {
|
||||||
|
+ id: popup
|
||||||
|
+ y: parent.height - height
|
||||||
|
+ width: 50
|
||||||
|
+ height: 50
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ Popup {
|
||||||
|
+ id: modalPopup
|
||||||
|
+ modal: true
|
||||||
|
+ y: parent.height - height
|
||||||
|
+ width: 50
|
||||||
|
+ height: 50
|
||||||
|
+ exit: Transition { PauseAnimation { duration: 100 } }
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
diff --git a/tests/auto/qquickpopup/tst_qquickpopup.cpp b/tests/auto/qquickpopup/tst_qquickpopup.cpp
|
||||||
|
index ede3640c2..f1840946b 100644
|
||||||
|
--- a/tests/auto/qquickpopup/tst_qquickpopup.cpp
|
||||||
|
+++ b/tests/auto/qquickpopup/tst_qquickpopup.cpp
|
||||||
|
@@ -97,6 +97,7 @@ private slots:
|
||||||
|
void invisibleToolTipOpen();
|
||||||
|
void centerInOverlayWithinStackViewItem();
|
||||||
|
void destroyDuringExitTransition();
|
||||||
|
+ void releaseAfterExitTransition();
|
||||||
|
};
|
||||||
|
|
||||||
|
void tst_QQuickPopup::initTestCase()
|
||||||
|
@@ -1459,6 +1460,34 @@ void tst_QQuickPopup::destroyDuringExitTransition()
|
||||||
|
QVERIFY(!button->isDown());
|
||||||
|
}
|
||||||
|
|
||||||
|
+void tst_QQuickPopup::releaseAfterExitTransition()
|
||||||
|
+{
|
||||||
|
+ QQuickApplicationHelper helper(this, "releaseAfterExitTransition.qml");
|
||||||
|
+ QVERIFY2(helper.ready, helper.failureMessage());
|
||||||
|
+
|
||||||
|
+ QQuickWindow *window = helper.window;
|
||||||
|
+ window->show();
|
||||||
|
+ QVERIFY(QTest::qWaitForWindowActive(window));
|
||||||
|
+
|
||||||
|
+ QQuickOverlay *overlay = QQuickOverlay::overlay(window);
|
||||||
|
+ QQuickPopup *modalPopup = window->property("modalPopup").value<QQuickPopup *>();
|
||||||
|
+ QQuickPopup *popup = window->property("popup").value<QQuickPopup *>();
|
||||||
|
+
|
||||||
|
+ modalPopup->open();
|
||||||
|
+ QTRY_VERIFY(modalPopup->isOpened());
|
||||||
|
+
|
||||||
|
+ QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1));
|
||||||
|
+ // wait until the transition is finished and the overlay hides itself
|
||||||
|
+ QTRY_VERIFY(!overlay->isVisible());
|
||||||
|
+ QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1));
|
||||||
|
+
|
||||||
|
+ popup->open();
|
||||||
|
+ QTRY_VERIFY(popup->isOpened());
|
||||||
|
+ QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1));
|
||||||
|
+ QTRY_VERIFY(!popup->isOpened());
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
QTEST_QUICKCONTROLS_MAIN(tst_QQuickPopup)
|
||||||
|
|
||||||
|
#include "tst_qquickpopup.moc"
|
||||||
|
|||||||
@@ -11,14 +11,14 @@
|
|||||||
<Summary>Next generation user interface controls based on Qt Quick</Summary>
|
<Summary>Next generation user interface controls based on Qt Quick</Summary>
|
||||||
<Description>Next generation user interface controls based on Qt Quick</Description>
|
<Description>Next generation user interface controls based on Qt Quick</Description>
|
||||||
<License>LGPLv2.1-linking-exception</License>
|
<License>LGPLv2.1-linking-exception</License>
|
||||||
<Archive sha1sum="3789720650653cb817d50c5b168017c82c878295" type="tarxz">https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtquickcontrols2-everywhere-opensource-src-5.15.5.tar.xz</Archive>
|
<Archive sha1sum="84c4655e19e5628f126946858f11e7407e7c32c2" type="tarxz">https://download.qt.io/official_releases/qt/5.15/5.15.7/submodules/qtquickcontrols2-everywhere-opensource-src-5.15.7.tar.xz</Archive>
|
||||||
<BuildDependencies>
|
<BuildDependencies>
|
||||||
<Dependency versionFrom="5.15.5">qt5-sql-sqlite</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-sql-sqlite</Dependency>
|
||||||
<Dependency versionFrom="5.15.5">qt5-base-devel</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-base-devel</Dependency>
|
||||||
<Dependency versionFrom="5.15.5">qt5-assistant-devel</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-assistant-devel</Dependency>
|
||||||
<Dependency versionFrom="5.15.5">qt5-graphicaleffects</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-graphicaleffects</Dependency>
|
||||||
<Dependency versionFrom="5.15.5">qt5-xmlpatterns-devel</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-xmlpatterns-devel</Dependency>
|
||||||
<Dependency versionFrom="5.15.5">qt5-declarative-devel</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-declarative-devel</Dependency>
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
<Patches>
|
<Patches>
|
||||||
<Patch level="1">qt_kde.patch</Patch>
|
<Patch level="1">qt_kde.patch</Patch>
|
||||||
@@ -29,9 +29,9 @@
|
|||||||
<Name>qt5-quickcontrols2</Name>
|
<Name>qt5-quickcontrols2</Name>
|
||||||
<RuntimeDependencies>
|
<RuntimeDependencies>
|
||||||
<Dependency>libgcc</Dependency>
|
<Dependency>libgcc</Dependency>
|
||||||
<Dependency versionFrom="5.15.5">qt5-base</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-base</Dependency>
|
||||||
<Dependency versionFrom="5.15.5">qt5-declarative</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-declarative</Dependency>
|
||||||
<Dependency versionFrom="5.15.5">qt5-graphicaleffects</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-graphicaleffects</Dependency>
|
||||||
</RuntimeDependencies>
|
</RuntimeDependencies>
|
||||||
<Files>
|
<Files>
|
||||||
<Path fileType="library">/usr/lib</Path>
|
<Path fileType="library">/usr/lib</Path>
|
||||||
@@ -44,8 +44,8 @@
|
|||||||
<Name>qt5-quickcontrols2-devel</Name>
|
<Name>qt5-quickcontrols2-devel</Name>
|
||||||
<RuntimeDependencies>
|
<RuntimeDependencies>
|
||||||
<Dependency release="current">qt5-quickcontrols2</Dependency>
|
<Dependency release="current">qt5-quickcontrols2</Dependency>
|
||||||
<Dependency versionFrom="5.15.5">qt5-base-devel</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-base-devel</Dependency>
|
||||||
<Dependency versionFrom="5.15.5">qt5-declarative-devel</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-declarative-devel</Dependency>
|
||||||
</RuntimeDependencies>
|
</RuntimeDependencies>
|
||||||
<Files>
|
<Files>
|
||||||
<Path fileType="header">/usr/include</Path>
|
<Path fileType="header">/usr/include</Path>
|
||||||
@@ -56,7 +56,7 @@
|
|||||||
<Package>
|
<Package>
|
||||||
<Name>qt5-quickcontrols2-docs</Name>
|
<Name>qt5-quickcontrols2-docs</Name>
|
||||||
<RuntimeDependencies>
|
<RuntimeDependencies>
|
||||||
<Dependency versionFrom="5.15.5">qt5-base</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-base</Dependency>
|
||||||
</RuntimeDependencies>
|
</RuntimeDependencies>
|
||||||
<Files>
|
<Files>
|
||||||
<Path fileType="doc">/usr/share/doc</Path>
|
<Path fileType="doc">/usr/share/doc</Path>
|
||||||
@@ -64,6 +64,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="30">
|
||||||
|
<Date>2022-12-21</Date>
|
||||||
|
<Version>5.15.7</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Mustafa Cinasal</Name>
|
||||||
|
<Email>muscnsl@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="29">
|
<Update release="29">
|
||||||
<Date>2022-08-24</Date>
|
<Date>2022-08-24</Date>
|
||||||
<Version>5.15.5</Version>
|
<Version>5.15.5</Version>
|
||||||
|
|||||||
@@ -14,18 +14,18 @@
|
|||||||
<License>LGPL3</License>
|
<License>LGPL3</License>
|
||||||
<Summary>Qt module for general purpose serial bus access</Summary>
|
<Summary>Qt module for general purpose serial bus access</Summary>
|
||||||
<Description>Qt module for general purpose serial bus access</Description>
|
<Description>Qt module for general purpose serial bus access</Description>
|
||||||
<Archive type="tarxz" sha1sum="37de7adc0657adf7a7ff0db91711de80326902dd">http://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtserialbus-everywhere-opensource-src-5.15.5.tar.xz</Archive>
|
<Archive type="tarxz" sha1sum="183710b4943036302906baa1170ad96b625a5f1f">http://download.qt.io/official_releases/qt/5.15/5.15.7/submodules/qtserialbus-everywhere-opensource-src-5.15.7.tar.xz</Archive>
|
||||||
<BuildDependencies>
|
<BuildDependencies>
|
||||||
<Dependency versionFrom="5.15.5">qt5-base-devel</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-base-devel</Dependency>
|
||||||
<Dependency versionFrom="5.15.5">qt5-serialport-devel</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-serialport-devel</Dependency>
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
</Source>
|
</Source>
|
||||||
<Package>
|
<Package>
|
||||||
<Name>qt5-serialbus</Name>
|
<Name>qt5-serialbus</Name>
|
||||||
<Summary>Qt module for general purpose serial bus access</Summary>
|
<Summary>Qt module for general purpose serial bus access</Summary>
|
||||||
<RuntimeDependencies>
|
<RuntimeDependencies>
|
||||||
<Dependency versionFrom="5.15.5">qt5-base</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-base</Dependency>
|
||||||
<Dependency versionFrom="5.15.5">qt5-serialport</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-serialport</Dependency>
|
||||||
<Dependency>libgcc</Dependency>
|
<Dependency>libgcc</Dependency>
|
||||||
</RuntimeDependencies>
|
</RuntimeDependencies>
|
||||||
<Files>
|
<Files>
|
||||||
@@ -40,7 +40,7 @@
|
|||||||
<Name>qt5-serialbus-devel</Name>
|
<Name>qt5-serialbus-devel</Name>
|
||||||
<Summary>Development files for qt5-serialbus</Summary>
|
<Summary>Development files for qt5-serialbus</Summary>
|
||||||
<RuntimeDependencies>
|
<RuntimeDependencies>
|
||||||
<Dependency versionFrom="5.15.5">qt5-base-devel</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-base-devel</Dependency>
|
||||||
<Dependency release="current">qt5-serialbus</Dependency>
|
<Dependency release="current">qt5-serialbus</Dependency>
|
||||||
</RuntimeDependencies>
|
</RuntimeDependencies>
|
||||||
<Files>
|
<Files>
|
||||||
@@ -51,6 +51,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="19">
|
||||||
|
<Date>2022-12-21</Date>
|
||||||
|
<Version>5.15.7</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Mustafa Cinasal</Name>
|
||||||
|
<Email>muscnsl@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="18">
|
<Update release="18">
|
||||||
<Date>2022-07-05</Date>
|
<Date>2022-07-05</Date>
|
||||||
<Version>5.15.5</Version>
|
<Version>5.15.5</Version>
|
||||||
|
|||||||
@@ -11,22 +11,22 @@
|
|||||||
<License>GPL3</License>
|
<License>GPL3</License>
|
||||||
<Summary>Qt module for general purpose serial bus access</Summary>
|
<Summary>Qt module for general purpose serial bus access</Summary>
|
||||||
<Description>Virtual keyboard framework</Description>
|
<Description>Virtual keyboard framework</Description>
|
||||||
<Archive type="tarxz" sha1sum="d5bad73582d299d5a185c23fb3d1cacfb0d2e6a1">http://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtvirtualkeyboard-everywhere-opensource-src-5.15.5.tar.xz</Archive>
|
<Archive type="tarxz" sha1sum="7a47c5dc032788bd72a6365a56cf5b3df458bbe2">http://download.qt.io/official_releases/qt/5.15/5.15.7/submodules/qtvirtualkeyboard-everywhere-opensource-src-5.15.7.tar.xz</Archive>
|
||||||
<BuildDependencies>
|
<BuildDependencies>
|
||||||
<Dependency>libxcb-devel</Dependency>
|
<Dependency>libxcb-devel</Dependency>
|
||||||
<Dependency>hunspell-devel</Dependency>
|
<Dependency>hunspell-devel</Dependency>
|
||||||
<Dependency versionFrom="5.15.5">qt5-svg-devel</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-svg-devel</Dependency>
|
||||||
<Dependency versionFrom="5.15.5">qt5-base-devel</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-base-devel</Dependency>
|
||||||
<Dependency versionFrom="5.15.5">qt5-declarative-devel</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-declarative-devel</Dependency>
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
</Source>
|
</Source>
|
||||||
<Package>
|
<Package>
|
||||||
<Name>qt5-virtualkeyboard</Name>
|
<Name>qt5-virtualkeyboard</Name>
|
||||||
<Summary>Virtual keyboard framework</Summary>
|
<Summary>Virtual keyboard framework</Summary>
|
||||||
<RuntimeDependencies>
|
<RuntimeDependencies>
|
||||||
<Dependency versionFrom="5.15.5">qt5-svg</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-svg</Dependency>
|
||||||
<Dependency versionFrom="5.15.5">qt5-base</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-base</Dependency>
|
||||||
<Dependency versionFrom="5.15.5">qt5-declarative</Dependency>
|
<Dependency versionFrom="5.15.7">qt5-declarative</Dependency>
|
||||||
<Dependency>libgcc</Dependency>
|
<Dependency>libgcc</Dependency>
|
||||||
<Dependency>libxcb</Dependency>
|
<Dependency>libxcb</Dependency>
|
||||||
<Dependency>hunspell</Dependency>
|
<Dependency>hunspell</Dependency>
|
||||||
@@ -51,6 +51,13 @@
|
|||||||
</Files>
|
</Files>
|
||||||
</Package>
|
</Package>
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="19">
|
||||||
|
<Date>2022-12-21</Date>
|
||||||
|
<Version>5.15.7</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Mustafa Cinasal</Name>
|
||||||
|
<Email>muscnsl@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="18">
|
<Update release="18">
|
||||||
<Date>2022-07-05</Date>
|
<Date>2022-07-05</Date>
|
||||||
<Version>5.15.5</Version>
|
<Version>5.15.5</Version>
|
||||||
|
|||||||
Reference in New Issue
Block a user