aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmlanybinding/tst_qqmlanybinding.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/qml/qqmlanybinding/tst_qqmlanybinding.cpp')
-rw-r--r--tests/auto/qml/qqmlanybinding/tst_qqmlanybinding.cpp73
1 files changed, 44 insertions, 29 deletions
diff --git a/tests/auto/qml/qqmlanybinding/tst_qqmlanybinding.cpp b/tests/auto/qml/qqmlanybinding/tst_qqmlanybinding.cpp
index d99b988c52..7e0a1c659a 100644
--- a/tests/auto/qml/qqmlanybinding/tst_qqmlanybinding.cpp
+++ b/tests/auto/qml/qqmlanybinding/tst_qqmlanybinding.cpp
@@ -1,46 +1,30 @@
-/****************************************************************************
-**
-** 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:GPL-EXCEPT$
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include "../../shared/util.h"
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QtQml/QQmlEngine>
#include <QtQml/QQmlComponent>
#include <QtCore/QScopedPointer>
#include <QtQml/private/qqmlanybinding_p.h>
+#include <QtQuickTestUtils/private/qmlutils_p.h>
#include "withbindable.h"
class tst_qqmlanybinding : public QQmlDataTest
{
Q_OBJECT
+public:
+ tst_qqmlanybinding();
+
private slots:
void basicActions_data();
void basicActions();
+ void unboundQQmlPropertyBindingDoesNotCrash();
};
+tst_qqmlanybinding::tst_qqmlanybinding()
+ : QQmlDataTest(QT_QMLTEST_DATADIR)
+{
+}
+
void tst_qqmlanybinding::basicActions_data()
{
QTest::addColumn<QString>("fileName");
@@ -55,7 +39,7 @@ static int getRefCount(const QQmlAnyBinding &binding)
} else {
// this temporarily adds a refcount because we construc a new untypedpropertybinding
// thus -1
- return QPropertyBindingPrivate::get(binding.asUntypedPropertyBinding())->ref - 1;
+ return QPropertyBindingPrivate::get(binding.asUntypedPropertyBinding())->refCount() - 1;
}
}
@@ -112,6 +96,37 @@ void tst_qqmlanybinding::basicActions()
QCOMPARE(QQmlAnyBinding::ofProperty(a2), binding);
}
+void tst_qqmlanybinding::unboundQQmlPropertyBindingDoesNotCrash()
+{
+ QQmlEngine engine;
+ QQmlComponent comp(&engine, testFileUrl("unboundBinding.qml"));
+ QScopedPointer<QObject> root(comp.create());
+ QVERIFY2(root, qPrintable(comp.errorString()));
+
+ QQmlProperty prop(root.get(), "prop");
+ QQmlProperty trigger(root.get(), "trigger");
+
+ // Store a reference to the binding of prop.
+ auto binding = QQmlAnyBinding::ofProperty(prop);
+ QVERIFY(binding.isUntypedPropertyBinding());
+ QVERIFY(!binding.asUntypedPropertyBinding().isNull());
+
+ // If we break the binding,
+ prop.write(42);
+ QCOMPARE(prop.read(), 42);
+ {
+ auto noBinding = QQmlAnyBinding::ofProperty(prop);
+ QVERIFY(noBinding.asUntypedPropertyBinding().isNull());
+ }
+ // and trigger binding reevaluation
+ trigger.write(1);
+ // there is no crash.
+ // When we reinstall the binding,
+ binding.installOn(prop);
+ // the value is correctly updated.
+ QCOMPARE(prop.read(), 1);
+}
+
QTEST_MAIN(tst_qqmlanybinding)
#include "tst_qqmlanybinding.moc"