qt5-5.15.10
This commit is contained in:
@@ -79,10 +79,10 @@ index f38c2b09c..6eed2a024 100644
|
||||
|
||||
contentHeight = implicitContentHeight;
|
||||
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
|
||||
index bbbd0e622..c4da24cd8 100644
|
||||
index 409fb582c..c4b05c13c 100644
|
||||
--- a/src/quicktemplates2/qquickcontrol.cpp
|
||||
+++ b/src/quicktemplates2/qquickcontrol.cpp
|
||||
@@ -845,6 +845,13 @@ void QQuickControlPrivate::executeBackground(bool complete)
|
||||
@@ -846,6 +846,13 @@ void QQuickControlPrivate::executeBackground(bool complete)
|
||||
quickCompleteDeferred(q, backgroundName(), background);
|
||||
}
|
||||
|
||||
@@ -96,7 +96,7 @@ index bbbd0e622..c4da24cd8 100644
|
||||
void QQuickControlPrivate::hideOldItem(QQuickItem *item)
|
||||
{
|
||||
if (!item)
|
||||
@@ -863,6 +870,29 @@ void QQuickControlPrivate::hideOldItem(QQuickItem *item)
|
||||
@@ -864,6 +871,29 @@ void QQuickControlPrivate::hideOldItem(QQuickItem *item)
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -126,7 +126,7 @@ index bbbd0e622..c4da24cd8 100644
|
||||
void QQuickControlPrivate::updateBaselineOffset()
|
||||
{
|
||||
Q_Q(QQuickControl);
|
||||
@@ -2296,12 +2326,13 @@ QAccessible::Role QQuickControl::accessibleRole() const
|
||||
@@ -2297,12 +2327,13 @@ QAccessible::Role QQuickControl::accessibleRole() const
|
||||
|
||||
void QQuickControl::accessibilityActiveChanged(bool active)
|
||||
{
|
||||
@@ -306,7 +306,7 @@ index 4e2f509db..1c4b308cd 100644
|
||||
vertical->setSize(area->property("heightRatio").toReal());
|
||||
vertical->setPosition(area->property("yPosition").toReal());
|
||||
diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp
|
||||
index d09d9c3b2..4346afd95 100644
|
||||
index 64fc631dd..fba3f6b70 100644
|
||||
--- a/src/quicktemplates2/qquicktextarea.cpp
|
||||
+++ b/src/quicktemplates2/qquicktextarea.cpp
|
||||
@@ -512,7 +512,7 @@ void QQuickTextAreaPrivate::accessibilityActiveChanged(bool active)
|
||||
|
||||
Reference in New Issue
Block a user