qt5-5.15.5
This commit is contained in:
@@ -108,6 +108,31 @@ index e6db14eb5..6197d1547 100644
|
|||||||
const int count = contentModel->count();
|
const int count = contentModel->count();
|
||||||
qreal maxHeight = 0;
|
qreal maxHeight = 0;
|
||||||
for (int i = 0; i < count; ++i) {
|
for (int i = 0; i < count; ++i) {
|
||||||
|
diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp
|
||||||
|
index a934fa8ae..0043dddde 100644
|
||||||
|
--- a/src/quicktemplates2/qquickmenu.cpp
|
||||||
|
+++ b/src/quicktemplates2/qquickmenu.cpp
|
||||||
|
@@ -222,7 +222,6 @@ QQuickMenuPrivate::QQuickMenuPrivate()
|
||||||
|
void QQuickMenuPrivate::init()
|
||||||
|
{
|
||||||
|
Q_Q(QQuickMenu);
|
||||||
|
- QQuickPopupPrivate::init();
|
||||||
|
contentModel = new QQmlObjectModel(q);
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/src/quicktemplates2/qquickmenu_p_p.h b/src/quicktemplates2/qquickmenu_p_p.h
|
||||||
|
index b1fbb1efb..63553f8a5 100644
|
||||||
|
--- a/src/quicktemplates2/qquickmenu_p_p.h
|
||||||
|
+++ b/src/quicktemplates2/qquickmenu_p_p.h
|
||||||
|
@@ -73,7 +73,7 @@ public:
|
||||||
|
return menu->d_func();
|
||||||
|
}
|
||||||
|
|
||||||
|
- void init() override;
|
||||||
|
+ void init();
|
||||||
|
|
||||||
|
QQuickItem *itemAt(int index) const;
|
||||||
|
void insertItem(int index, QQuickItem *item);
|
||||||
diff --git a/src/quicktemplates2/qquickoverlay.cpp b/src/quicktemplates2/qquickoverlay.cpp
|
diff --git a/src/quicktemplates2/qquickoverlay.cpp b/src/quicktemplates2/qquickoverlay.cpp
|
||||||
index b8d417f29..c8cd142ae 100644
|
index b8d417f29..c8cd142ae 100644
|
||||||
--- a/src/quicktemplates2/qquickoverlay.cpp
|
--- a/src/quicktemplates2/qquickoverlay.cpp
|
||||||
@@ -125,6 +150,390 @@ index b8d417f29..c8cd142ae 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
void QQuickOverlay::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
|
void QQuickOverlay::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
|
||||||
|
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
|
||||||
|
index 8a03198e5..bdc6dff27 100644
|
||||||
|
--- a/src/quicktemplates2/qquickpopup.cpp
|
||||||
|
+++ b/src/quicktemplates2/qquickpopup.cpp
|
||||||
|
@@ -275,21 +275,9 @@ QQuickPopupPrivate::QQuickPopupPrivate()
|
||||||
|
void QQuickPopupPrivate::init()
|
||||||
|
{
|
||||||
|
Q_Q(QQuickPopup);
|
||||||
|
- createPopupItem();
|
||||||
|
+ popupItem = new QQuickPopupItem(q);
|
||||||
|
popupItem->setVisible(false);
|
||||||
|
q->setParentItem(qobject_cast<QQuickItem *>(parent));
|
||||||
|
- connectToPopupItem();
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
-void QQuickPopupPrivate::createPopupItem()
|
||||||
|
-{
|
||||||
|
- Q_Q(QQuickPopup);
|
||||||
|
- popupItem = new QQuickPopupItem(q);
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
-void QQuickPopupPrivate::connectToPopupItem()
|
||||||
|
-{
|
||||||
|
- Q_Q(QQuickPopup);
|
||||||
|
QObject::connect(popupItem, &QQuickControl::paddingChanged, q, &QQuickPopup::paddingChanged);
|
||||||
|
QObject::connect(popupItem, &QQuickControl::backgroundChanged, q, &QQuickPopup::backgroundChanged);
|
||||||
|
QObject::connect(popupItem, &QQuickControl::contentItemChanged, q, &QQuickPopup::contentItemChanged);
|
||||||
|
@@ -854,7 +842,8 @@ QQuickPopup::QQuickPopup(QObject *parent)
|
||||||
|
QQuickPopup::QQuickPopup(QQuickPopupPrivate &dd, QObject *parent)
|
||||||
|
: QObject(dd, parent)
|
||||||
|
{
|
||||||
|
- dd.init();
|
||||||
|
+ Q_D(QQuickPopup);
|
||||||
|
+ d->init();
|
||||||
|
}
|
||||||
|
|
||||||
|
QQuickPopup::~QQuickPopup()
|
||||||
|
diff --git a/src/quicktemplates2/qquickpopup_p_p.h b/src/quicktemplates2/qquickpopup_p_p.h
|
||||||
|
index 2fc0f133d..ef4b112e2 100644
|
||||||
|
--- a/src/quicktemplates2/qquickpopup_p_p.h
|
||||||
|
+++ b/src/quicktemplates2/qquickpopup_p_p.h
|
||||||
|
@@ -96,9 +96,7 @@ public:
|
||||||
|
QQmlListProperty<QObject> contentData();
|
||||||
|
QQmlListProperty<QQuickItem> contentChildren();
|
||||||
|
|
||||||
|
- virtual void init();
|
||||||
|
- void createPopupItem();
|
||||||
|
- void connectToPopupItem();
|
||||||
|
+ void init();
|
||||||
|
void closeOrReject();
|
||||||
|
bool tryClose(const QPointF &pos, QQuickPopup::ClosePolicy flags);
|
||||||
|
|
||||||
|
diff --git a/src/quicktemplates2/qquickpopupitem.cpp b/src/quicktemplates2/qquickpopupitem.cpp
|
||||||
|
index 992d74570..0069b9fc1 100644
|
||||||
|
--- a/src/quicktemplates2/qquickpopupitem.cpp
|
||||||
|
+++ b/src/quicktemplates2/qquickpopupitem.cpp
|
||||||
|
@@ -53,33 +53,38 @@
|
||||||
|
|
||||||
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
+class QQuickPopupItemPrivate : public QQuickPagePrivate
|
||||||
|
+{
|
||||||
|
+ Q_DECLARE_PUBLIC(QQuickPopupItem)
|
||||||
|
+
|
||||||
|
+public:
|
||||||
|
+ QQuickPopupItemPrivate(QQuickPopup *popup);
|
||||||
|
+
|
||||||
|
+ void implicitWidthChanged() override;
|
||||||
|
+ void implicitHeightChanged() override;
|
||||||
|
+
|
||||||
|
+ void resolveFont() override;
|
||||||
|
+ void resolvePalette() override;
|
||||||
|
+
|
||||||
|
+ QQuickItem *getContentItem() override;
|
||||||
|
+
|
||||||
|
+ void cancelContentItem() override;
|
||||||
|
+ void executeContentItem(bool complete = false) override;
|
||||||
|
+
|
||||||
|
+ void cancelBackground() override;
|
||||||
|
+ void executeBackground(bool complete = false) override;
|
||||||
|
+
|
||||||
|
+ int backId = 0;
|
||||||
|
+ int escapeId = 0;
|
||||||
|
+ QQuickPopup *popup = nullptr;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
QQuickPopupItemPrivate::QQuickPopupItemPrivate(QQuickPopup *popup)
|
||||||
|
: popup(popup)
|
||||||
|
{
|
||||||
|
isTabFence = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
-void QQuickPopupItemPrivate::init()
|
||||||
|
-{
|
||||||
|
- Q_Q(QQuickPopupItem);
|
||||||
|
- q->setParent(popup);
|
||||||
|
- q->setFlag(QQuickItem::ItemIsFocusScope);
|
||||||
|
- q->setAcceptedMouseButtons(Qt::AllButtons);
|
||||||
|
-#if QT_CONFIG(quicktemplates2_multitouch)
|
||||||
|
- q->setAcceptTouchEvents(true);
|
||||||
|
-#endif
|
||||||
|
-#if QT_CONFIG(cursor)
|
||||||
|
- q->setCursor(Qt::ArrowCursor);
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
-#if QT_CONFIG(quicktemplates2_hover)
|
||||||
|
- // TODO: switch to QStyleHints::useHoverEffects in Qt 5.8
|
||||||
|
- q->setHoverEnabled(true);
|
||||||
|
- // setAcceptHoverEvents(QGuiApplication::styleHints()->useHoverEffects());
|
||||||
|
- // connect(QGuiApplication::styleHints(), &QStyleHints::useHoverEffectsChanged, this, &QQuickItem::setAcceptHoverEvents);
|
||||||
|
-#endif
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
void QQuickPopupItemPrivate::implicitWidthChanged()
|
||||||
|
{
|
||||||
|
QQuickPagePrivate::implicitWidthChanged();
|
||||||
|
@@ -156,15 +161,22 @@ void QQuickPopupItemPrivate::executeBackground(bool complete)
|
||||||
|
QQuickPopupItem::QQuickPopupItem(QQuickPopup *popup)
|
||||||
|
: QQuickPage(*(new QQuickPopupItemPrivate(popup)), nullptr)
|
||||||
|
{
|
||||||
|
- Q_D(QQuickPopupItem);
|
||||||
|
- d->init();
|
||||||
|
-}
|
||||||
|
+ setParent(popup);
|
||||||
|
+ setFlag(ItemIsFocusScope);
|
||||||
|
+ setAcceptedMouseButtons(Qt::AllButtons);
|
||||||
|
+#if QT_CONFIG(quicktemplates2_multitouch)
|
||||||
|
+ setAcceptTouchEvents(true);
|
||||||
|
+#endif
|
||||||
|
+#if QT_CONFIG(cursor)
|
||||||
|
+ setCursor(Qt::ArrowCursor);
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
-QQuickPopupItem::QQuickPopupItem(QQuickPopupItemPrivate &dd) :
|
||||||
|
- QQuickPage(dd, nullptr)
|
||||||
|
-{
|
||||||
|
- Q_D(QQuickPopupItem);
|
||||||
|
- d->init();
|
||||||
|
+#if QT_CONFIG(quicktemplates2_hover)
|
||||||
|
+ // TODO: switch to QStyleHints::useHoverEffects in Qt 5.8
|
||||||
|
+ setHoverEnabled(true);
|
||||||
|
+ // setAcceptHoverEvents(QGuiApplication::styleHints()->useHoverEffects());
|
||||||
|
+ // connect(QGuiApplication::styleHints(), &QStyleHints::useHoverEffectsChanged, this, &QQuickItem::setAcceptHoverEvents);
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
void QQuickPopupItem::grabShortcut()
|
||||||
|
diff --git a/src/quicktemplates2/qquickpopupitem_p.h b/src/quicktemplates2/qquickpopupitem_p.h
|
||||||
|
deleted file mode 100644
|
||||||
|
index df67e7453..000000000
|
||||||
|
--- a/src/quicktemplates2/qquickpopupitem_p.h
|
||||||
|
+++ /dev/null
|
||||||
|
@@ -1,121 +0,0 @@
|
||||||
|
-/****************************************************************************
|
||||||
|
-**
|
||||||
|
-** Copyright (C) 2021 The Qt Company Ltd.
|
||||||
|
-** Contact: https://www.qt.io/licensing/
|
||||||
|
-**
|
||||||
|
-** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit.
|
||||||
|
-**
|
||||||
|
-** $QT_BEGIN_LICENSE:COMM$
|
||||||
|
-**
|
||||||
|
-** 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.
|
||||||
|
-**
|
||||||
|
-** $QT_END_LICENSE$
|
||||||
|
-**
|
||||||
|
-**
|
||||||
|
-**
|
||||||
|
-**
|
||||||
|
-**
|
||||||
|
-**
|
||||||
|
-**
|
||||||
|
-**
|
||||||
|
-**
|
||||||
|
-**
|
||||||
|
-**
|
||||||
|
-**
|
||||||
|
-**
|
||||||
|
-**
|
||||||
|
-**
|
||||||
|
-**
|
||||||
|
-****************************************************************************/
|
||||||
|
-
|
||||||
|
-#ifndef QQUICKPOPUPITEM_P_H
|
||||||
|
-#define QQUICKPOPUPITEM_P_H
|
||||||
|
-
|
||||||
|
-//
|
||||||
|
-// W A R N I N G
|
||||||
|
-// -------------
|
||||||
|
-//
|
||||||
|
-// This file is not part of the Qt API. It exists purely as an
|
||||||
|
-// implementation detail. This header file may change from version to
|
||||||
|
-// version without notice, or even be removed.
|
||||||
|
-//
|
||||||
|
-// We mean it.
|
||||||
|
-//
|
||||||
|
-
|
||||||
|
-#include <QtQuickTemplates2/private/qquickpage_p.h>
|
||||||
|
-#include <QtQuickTemplates2/private/qquickpage_p_p.h>
|
||||||
|
-
|
||||||
|
-QT_BEGIN_NAMESPACE
|
||||||
|
-
|
||||||
|
-class QQuickPopup;
|
||||||
|
-class QQuickPopupItemPrivate;
|
||||||
|
-
|
||||||
|
-class QQuickPopupItem : public QQuickPage
|
||||||
|
-{
|
||||||
|
- Q_OBJECT
|
||||||
|
-
|
||||||
|
-public:
|
||||||
|
- explicit QQuickPopupItem(QQuickPopup *popup);
|
||||||
|
-
|
||||||
|
- void grabShortcut();
|
||||||
|
- void ungrabShortcut();
|
||||||
|
-
|
||||||
|
-protected:
|
||||||
|
- void updatePolish() override;
|
||||||
|
-
|
||||||
|
- bool event(QEvent *event) override;
|
||||||
|
- bool childMouseEventFilter(QQuickItem *child, QEvent *event) override;
|
||||||
|
- void focusInEvent(QFocusEvent *event) override;
|
||||||
|
- void focusOutEvent(QFocusEvent *event) override;
|
||||||
|
- void keyPressEvent(QKeyEvent *event) override;
|
||||||
|
- void keyReleaseEvent(QKeyEvent *event) override;
|
||||||
|
- void mousePressEvent(QMouseEvent *event) override;
|
||||||
|
- void mouseMoveEvent(QMouseEvent *event) override;
|
||||||
|
- void mouseReleaseEvent(QMouseEvent *event) override;
|
||||||
|
- void mouseDoubleClickEvent(QMouseEvent *event) override;
|
||||||
|
- void mouseUngrabEvent() override;
|
||||||
|
-#if QT_CONFIG(quicktemplates2_multitouch)
|
||||||
|
- void touchEvent(QTouchEvent *event) override;
|
||||||
|
- void touchUngrabEvent() override;
|
||||||
|
-#endif
|
||||||
|
-#if QT_CONFIG(wheelevent)
|
||||||
|
- void wheelEvent(QWheelEvent *event) override;
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
- void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override;
|
||||||
|
- void contentSizeChange(const QSizeF &newSize, const QSizeF &oldSize) override;
|
||||||
|
- void fontChange(const QFont &newFont, const QFont &oldFont) override;
|
||||||
|
- void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
|
||||||
|
- void localeChange(const QLocale &newLocale, const QLocale &oldLocale) override;
|
||||||
|
- void mirrorChange() override;
|
||||||
|
- void itemChange(ItemChange change, const ItemChangeData &data) override;
|
||||||
|
- void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) override;
|
||||||
|
- void paletteChange(const QPalette &newPalette, const QPalette &oldPalette) override;
|
||||||
|
- void enabledChange() override;
|
||||||
|
-
|
||||||
|
- QFont defaultFont() const override;
|
||||||
|
- QPalette defaultPalette() const override;
|
||||||
|
-
|
||||||
|
-#if QT_CONFIG(accessibility)
|
||||||
|
- QAccessible::Role accessibleRole() const override;
|
||||||
|
- void accessibilityActiveChanged(bool active) override;
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
-protected:
|
||||||
|
- QQuickPopupItem(QQuickPopupItemPrivate &dd);
|
||||||
|
-
|
||||||
|
-private:
|
||||||
|
- Q_DISABLE_COPY(QQuickPopupItem)
|
||||||
|
- Q_DECLARE_PRIVATE(QQuickPopupItem)
|
||||||
|
- friend class QQuickPopup;
|
||||||
|
-};
|
||||||
|
-
|
||||||
|
-QT_END_NAMESPACE
|
||||||
|
-
|
||||||
|
-#endif // QQUICKPOPUPITEM_P_H
|
||||||
|
diff --git a/src/quicktemplates2/qquickpopupitem_p_p.h b/src/quicktemplates2/qquickpopupitem_p_p.h
|
||||||
|
index 65b33b21e..a12e43e0a 100644
|
||||||
|
--- a/src/quicktemplates2/qquickpopupitem_p_p.h
|
||||||
|
+++ b/src/quicktemplates2/qquickpopupitem_p_p.h
|
||||||
|
@@ -48,39 +48,67 @@
|
||||||
|
// We mean it.
|
||||||
|
//
|
||||||
|
|
||||||
|
-#include <QtQuickTemplates2/private/qquickpopupitem_p.h>
|
||||||
|
-#include <QtQuickTemplates2/private/qquickpalette_p.h>
|
||||||
|
+#include <QtQuickTemplates2/private/qquickpage_p.h>
|
||||||
|
|
||||||
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
class QQuickPopup;
|
||||||
|
-
|
||||||
|
-class QQuickPopupItemPrivate : public QQuickPagePrivate
|
||||||
|
+class QQuickPopupItemPrivate;
|
||||||
|
+class QQuickPopupItem : public QQuickPage
|
||||||
|
{
|
||||||
|
- Q_DECLARE_PUBLIC(QQuickPopupItem)
|
||||||
|
+ Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
- QQuickPopupItemPrivate(QQuickPopup *popup);
|
||||||
|
-
|
||||||
|
- void init();
|
||||||
|
-
|
||||||
|
- void implicitWidthChanged() override;
|
||||||
|
- void implicitHeightChanged() override;
|
||||||
|
-
|
||||||
|
- void resolveFont() override;
|
||||||
|
- void resolvePalette() override;
|
||||||
|
-
|
||||||
|
- QQuickItem *getContentItem() override;
|
||||||
|
-
|
||||||
|
- void cancelContentItem() override;
|
||||||
|
- void executeContentItem(bool complete = false) override;
|
||||||
|
-
|
||||||
|
- void cancelBackground() override;
|
||||||
|
- void executeBackground(bool complete = false) override;
|
||||||
|
-
|
||||||
|
- int backId = 0;
|
||||||
|
- int escapeId = 0;
|
||||||
|
- QQuickPopup *popup = nullptr;
|
||||||
|
+ explicit QQuickPopupItem(QQuickPopup *popup);
|
||||||
|
+
|
||||||
|
+ void grabShortcut();
|
||||||
|
+ void ungrabShortcut();
|
||||||
|
+
|
||||||
|
+protected:
|
||||||
|
+ void updatePolish() override;
|
||||||
|
+
|
||||||
|
+ bool event(QEvent *event) override;
|
||||||
|
+ bool childMouseEventFilter(QQuickItem *child, QEvent *event) override;
|
||||||
|
+ void focusInEvent(QFocusEvent *event) override;
|
||||||
|
+ void focusOutEvent(QFocusEvent *event) override;
|
||||||
|
+ void keyPressEvent(QKeyEvent *event) override;
|
||||||
|
+ void keyReleaseEvent(QKeyEvent *event) override;
|
||||||
|
+ void mousePressEvent(QMouseEvent *event) override;
|
||||||
|
+ void mouseMoveEvent(QMouseEvent *event) override;
|
||||||
|
+ void mouseReleaseEvent(QMouseEvent *event) override;
|
||||||
|
+ void mouseDoubleClickEvent(QMouseEvent *event) override;
|
||||||
|
+ void mouseUngrabEvent() override;
|
||||||
|
+#if QT_CONFIG(quicktemplates2_multitouch)
|
||||||
|
+ void touchEvent(QTouchEvent *event) override;
|
||||||
|
+ void touchUngrabEvent() override;
|
||||||
|
+#endif
|
||||||
|
+#if QT_CONFIG(wheelevent)
|
||||||
|
+ void wheelEvent(QWheelEvent *event) override;
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+ void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override;
|
||||||
|
+ void contentSizeChange(const QSizeF &newSize, const QSizeF &oldSize) override;
|
||||||
|
+ void fontChange(const QFont &newFont, const QFont &oldFont) override;
|
||||||
|
+ void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
|
||||||
|
+ void localeChange(const QLocale &newLocale, const QLocale &oldLocale) override;
|
||||||
|
+ void mirrorChange() override;
|
||||||
|
+ void itemChange(ItemChange change, const ItemChangeData &data) override;
|
||||||
|
+ void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) override;
|
||||||
|
+ void paletteChange(const QPalette &newPalette, const QPalette &oldPalette) override;
|
||||||
|
+ void enabledChange() override;
|
||||||
|
+
|
||||||
|
+ QFont defaultFont() const override;
|
||||||
|
+ QPalette defaultPalette() const override;
|
||||||
|
+
|
||||||
|
+#if QT_CONFIG(accessibility)
|
||||||
|
+ QAccessible::Role accessibleRole() const override;
|
||||||
|
+ void accessibilityActiveChanged(bool active) override;
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+private:
|
||||||
|
+ Q_DISABLE_COPY(QQuickPopupItem)
|
||||||
|
+ Q_DECLARE_PRIVATE(QQuickPopupItem)
|
||||||
|
+ friend class QQuickPopup;
|
||||||
|
};
|
||||||
|
|
||||||
|
QT_END_NAMESPACE
|
||||||
|
diff --git a/src/quicktemplates2/quicktemplates2.pri b/src/quicktemplates2/quicktemplates2.pri
|
||||||
|
index ba09591bf..fa6929f92 100644
|
||||||
|
--- a/src/quicktemplates2/quicktemplates2.pri
|
||||||
|
+++ b/src/quicktemplates2/quicktemplates2.pri
|
||||||
|
@@ -60,7 +60,6 @@ HEADERS += \
|
||||||
|
$$PWD/qquickpopup_p_p.h \
|
||||||
|
$$PWD/qquickpopupanchors_p.h \
|
||||||
|
$$PWD/qquickpopupanchors_p_p.h \
|
||||||
|
- $$PWD/qquickpopupitem_p.h \
|
||||||
|
$$PWD/qquickpopupitem_p_p.h \
|
||||||
|
$$PWD/qquickpopuppositioner_p_p.h \
|
||||||
|
$$PWD/qquickpresshandler_p_p.h \
|
||||||
diff --git a/tests/auto/controls/data/tst_switch.qml b/tests/auto/controls/data/tst_switch.qml
|
diff --git a/tests/auto/controls/data/tst_switch.qml b/tests/auto/controls/data/tst_switch.qml
|
||||||
index b3fab41ca..10b6baa02 100644
|
index b3fab41ca..10b6baa02 100644
|
||||||
--- a/tests/auto/controls/data/tst_switch.qml
|
--- a/tests/auto/controls/data/tst_switch.qml
|
||||||
|
|||||||
@@ -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="0d97f2ed37154f175e725fe926214ac01934baed" type="tarxz">https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtquickcontrols2-everywhere-opensource-src-5.15.3.tar.xz</Archive>
|
<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>
|
||||||
<BuildDependencies>
|
<BuildDependencies>
|
||||||
<Dependency versionFrom="5.15.3">qt5-sql-sqlite</Dependency>
|
<Dependency versionFrom="5.15.5">qt5-sql-sqlite</Dependency>
|
||||||
<Dependency versionFrom="5.15.3">qt5-base-devel</Dependency>
|
<Dependency versionFrom="5.15.5">qt5-base-devel</Dependency>
|
||||||
<Dependency versionFrom="5.15.3">qt5-assistant-devel</Dependency>
|
<Dependency versionFrom="5.15.5">qt5-assistant-devel</Dependency>
|
||||||
<Dependency versionFrom="5.15.3">qt5-graphicaleffects</Dependency>
|
<Dependency versionFrom="5.15.5">qt5-graphicaleffects</Dependency>
|
||||||
<Dependency versionFrom="5.15.3">qt5-xmlpatterns-devel</Dependency>
|
<Dependency versionFrom="5.15.5">qt5-xmlpatterns-devel</Dependency>
|
||||||
<Dependency versionFrom="5.15.3">qt5-declarative-devel</Dependency>
|
<Dependency versionFrom="5.15.5">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.3">qt5-base</Dependency>
|
<Dependency versionFrom="5.15.5">qt5-base</Dependency>
|
||||||
<Dependency versionFrom="5.15.3">qt5-declarative</Dependency>
|
<Dependency versionFrom="5.15.5">qt5-declarative</Dependency>
|
||||||
<Dependency versionFrom="5.15.3">qt5-graphicaleffects</Dependency>
|
<Dependency versionFrom="5.15.5">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.3">qt5-base-devel</Dependency>
|
<Dependency versionFrom="5.15.5">qt5-base-devel</Dependency>
|
||||||
<Dependency versionFrom="5.15.3">qt5-declarative-devel</Dependency>
|
<Dependency versionFrom="5.15.5">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.3">qt5-base</Dependency>
|
<Dependency versionFrom="5.15.5">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="28">
|
||||||
|
<Date>2022-07-05</Date>
|
||||||
|
<Version>5.15.5</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Mustafa Cinasal</Name>
|
||||||
|
<Email>muscnsl@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="27">
|
<Update release="27">
|
||||||
<Date>2022-04-18</Date>
|
<Date>2022-04-18</Date>
|
||||||
<Version>5.15.3</Version>
|
<Version>5.15.3</Version>
|
||||||
|
|||||||
@@ -12,12 +12,12 @@
|
|||||||
<License>LGPLv2.1-linking-exception</License>
|
<License>LGPLv2.1-linking-exception</License>
|
||||||
<Summary>Inter-process communication (IPC) module developed for Qt</Summary>
|
<Summary>Inter-process communication (IPC) module developed for Qt</Summary>
|
||||||
<Description>qt5-remoteobjects, Inter-process communication (IPC) module developed for Qt</Description>
|
<Description>qt5-remoteobjects, Inter-process communication (IPC) module developed for Qt</Description>
|
||||||
<Archive sha1sum="647b8478356a64457061206a87f6e142816d33ae" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtremoteobjects-everywhere-opensource-src-5.15.3.tar.xz</Archive>
|
<Archive sha1sum="45624517786ed380afb5a23a8e1926eec05dd6f8" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtremoteobjects-everywhere-opensource-src-5.15.5.tar.xz</Archive>
|
||||||
<BuildDependencies>
|
<BuildDependencies>
|
||||||
<Dependency versionFrom="5.15.3">qt5-base-devel</Dependency>
|
<Dependency versionFrom="5.15.5">qt5-base-devel</Dependency>
|
||||||
<Dependency versionFrom="5.15.3">qt5-sql-sqlite</Dependency>
|
<Dependency versionFrom="5.15.5">qt5-sql-sqlite</Dependency>
|
||||||
<Dependency versionFrom="5.15.3">qt5-assistant-devel</Dependency>
|
<Dependency versionFrom="5.15.5">qt5-assistant-devel</Dependency>
|
||||||
<Dependency versionFrom="5.15.3">qt5-declarative-devel</Dependency>
|
<Dependency versionFrom="5.15.5">qt5-declarative-devel</Dependency>
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
</Source>
|
</Source>
|
||||||
|
|
||||||
@@ -25,9 +25,9 @@
|
|||||||
<Name>qt5-remoteobjects</Name>
|
<Name>qt5-remoteobjects</Name>
|
||||||
<Summary>Inter-process communication (IPC) module developed for Qt</Summary>
|
<Summary>Inter-process communication (IPC) module developed for Qt</Summary>
|
||||||
<RuntimeDependencies>
|
<RuntimeDependencies>
|
||||||
<Dependency versionFrom="5.15.3">qt5-base</Dependency>
|
<Dependency versionFrom="5.15.5">qt5-base</Dependency>
|
||||||
<Dependency versionFrom="5.15.3">qt5-assistant</Dependency>
|
<Dependency versionFrom="5.15.5">qt5-assistant</Dependency>
|
||||||
<Dependency versionFrom="5.15.3">qt5-declarative</Dependency>
|
<Dependency versionFrom="5.15.5">qt5-declarative</Dependency>
|
||||||
</RuntimeDependencies>
|
</RuntimeDependencies>
|
||||||
<Files>
|
<Files>
|
||||||
<Path fileType="library">/usr/lib</Path>
|
<Path fileType="library">/usr/lib</Path>
|
||||||
@@ -46,8 +46,8 @@
|
|||||||
</Files>
|
</Files>
|
||||||
<RuntimeDependencies>
|
<RuntimeDependencies>
|
||||||
<Dependency release="current">qt5-remoteobjects</Dependency>
|
<Dependency release="current">qt5-remoteobjects</Dependency>
|
||||||
<Dependency versionFrom="5.15.3">qt5-base-devel</Dependency>
|
<Dependency versionFrom="5.15.5">qt5-base-devel</Dependency>
|
||||||
<Dependency versionFrom="5.15.3">qt5-declarative-devel</Dependency>
|
<Dependency versionFrom="5.15.5">qt5-declarative-devel</Dependency>
|
||||||
</RuntimeDependencies>
|
</RuntimeDependencies>
|
||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
@@ -55,7 +55,7 @@
|
|||||||
<Name>qt5-remoteobjects-docs</Name>
|
<Name>qt5-remoteobjects-docs</Name>
|
||||||
<Summary>Documentation files for qt5-remoteobjects</Summary>
|
<Summary>Documentation files for qt5-remoteobjects</Summary>
|
||||||
<RuntimeDependencies>
|
<RuntimeDependencies>
|
||||||
<Dependency versionFrom="5.15.3">qt5-remoteobjects</Dependency>
|
<Dependency versionFrom="5.15.5">qt5-remoteobjects</Dependency>
|
||||||
</RuntimeDependencies>
|
</RuntimeDependencies>
|
||||||
<Files>
|
<Files>
|
||||||
<Path fileType="doc">/usr/share/doc</Path>
|
<Path fileType="doc">/usr/share/doc</Path>
|
||||||
@@ -63,6 +63,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="5">
|
||||||
|
<Date>2022-07-05</Date>
|
||||||
|
<Version>5.15.5</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Mustafa Cinasal</Name>
|
||||||
|
<Email>muscnsl@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="4">
|
<Update release="4">
|
||||||
<Date>2022-04-18</Date>
|
<Date>2022-04-18</Date>
|
||||||
<Version>5.15.3</Version>
|
<Version>5.15.3</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="1d753cdc3bea2c8bf9a3038824ef035d2e3429b4">http://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtserialbus-everywhere-opensource-src-5.15.3.tar.xz</Archive>
|
<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>
|
||||||
<BuildDependencies>
|
<BuildDependencies>
|
||||||
<Dependency versionFrom="5.15.3">qt5-base-devel</Dependency>
|
<Dependency versionFrom="5.15.5">qt5-base-devel</Dependency>
|
||||||
<Dependency versionFrom="5.15.3">qt5-serialport-devel</Dependency>
|
<Dependency versionFrom="5.15.5">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.3">qt5-base</Dependency>
|
<Dependency versionFrom="5.15.5">qt5-base</Dependency>
|
||||||
<Dependency versionFrom="5.15.3">qt5-serialport</Dependency>
|
<Dependency versionFrom="5.15.5">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.3">qt5-base-devel</Dependency>
|
<Dependency versionFrom="5.15.5">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="18">
|
||||||
|
<Date>2022-07-05</Date>
|
||||||
|
<Version>5.15.5</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Mustafa Cinasal</Name>
|
||||||
|
<Email>muscnsl@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="17">
|
<Update release="17">
|
||||||
<Date>2022-04-18</Date>
|
<Date>2022-04-18</Date>
|
||||||
<Version>5.15.3</Version>
|
<Version>5.15.3</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="cdfff1848d50a86694860e0634b9dbfcfd86f6f9">http://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtvirtualkeyboard-everywhere-opensource-src-5.15.3.tar.xz</Archive>
|
<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>
|
||||||
<BuildDependencies>
|
<BuildDependencies>
|
||||||
<Dependency>libxcb-devel</Dependency>
|
<Dependency>libxcb-devel</Dependency>
|
||||||
<Dependency>hunspell-devel</Dependency>
|
<Dependency>hunspell-devel</Dependency>
|
||||||
<Dependency versionFrom="5.15.3">qt5-svg-devel</Dependency>
|
<Dependency versionFrom="5.15.5">qt5-svg-devel</Dependency>
|
||||||
<Dependency versionFrom="5.15.3">qt5-base-devel</Dependency>
|
<Dependency versionFrom="5.15.5">qt5-base-devel</Dependency>
|
||||||
<Dependency versionFrom="5.15.3">qt5-declarative-devel</Dependency>
|
<Dependency versionFrom="5.15.5">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.3">qt5-svg</Dependency>
|
<Dependency versionFrom="5.15.5">qt5-svg</Dependency>
|
||||||
<Dependency versionFrom="5.15.3">qt5-base</Dependency>
|
<Dependency versionFrom="5.15.5">qt5-base</Dependency>
|
||||||
<Dependency versionFrom="5.15.3">qt5-declarative</Dependency>
|
<Dependency versionFrom="5.15.5">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="18">
|
||||||
|
<Date>2022-07-05</Date>
|
||||||
|
<Version>5.15.5</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Mustafa Cinasal</Name>
|
||||||
|
<Email>muscnsl@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="17">
|
<Update release="17">
|
||||||
<Date>2022-04-18</Date>
|
<Date>2022-04-18</Date>
|
||||||
<Version>5.15.3</Version>
|
<Version>5.15.3</Version>
|
||||||
|
|||||||
Reference in New Issue
Block a user