aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmlglobal
diff options
context:
space:
mode:
authorChris Adams <christopher.adams@nokia.com>2012-06-26 18:02:35 +1000
committerQt by Nokia <qt-info@nokia.com>2012-07-11 01:46:52 +0200
commitf5cb65b35e076facbce45e896902a34da7036135 (patch)
tree7575065fde2d0c14c379a992bf8b3593e21f4881 /tests/auto/qml/qqmlglobal
parent5376906de58e1c25c77b7a61800365b6e542542f (diff)
Fix broken value-type support by allowing property definition
In QtQuick 1.x the "variant" property type was supported, which could be used to allow value type properties to be defined in QML. In QtQuick 2.0, we have deprecated the "variant" property, but its replacement ("var") is not suited for defining lightweight C++ type values (such as QColor, QFont, QRectF, QVector3D etc). This commit allows those QML basic types to be used in QML once more, by supporting them in the property definition syntax. Note that since some value types are provided by QtQuick and others are provided by QtQml, if a client imports only QtQml they can define but not use properties of certain types (eg, font). Task-number: QTBUG-21034 Task-number: QTBUG-18217 Change-Id: Ia951a8522f223408d27293bb96c276281a710277 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Diffstat (limited to 'tests/auto/qml/qqmlglobal')
-rw-r--r--tests/auto/qml/qqmlglobal/tst_qqmlglobal.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/tests/auto/qml/qqmlglobal/tst_qqmlglobal.cpp b/tests/auto/qml/qqmlglobal/tst_qqmlglobal.cpp
index e2cdd50883..e32c13b98e 100644
--- a/tests/auto/qml/qqmlglobal/tst_qqmlglobal.cpp
+++ b/tests/auto/qml/qqmlglobal/tst_qqmlglobal.cpp
@@ -53,7 +53,6 @@ public:
private slots:
void initTestCase();
- void valueTypeProviderWarning();
void colorProviderWarning();
void guiProviderWarning();
};
@@ -62,13 +61,6 @@ void tst_qqmlglobal::initTestCase()
{
}
-void tst_qqmlglobal::valueTypeProviderWarning()
-{
- const QLatin1String expected("Warning: QQml_valueTypeProvider: no value type provider has been set! ");
- QTest::ignoreMessage(QtWarningMsg, expected.data());
- QQml_valueTypeProvider();
-}
-
void tst_qqmlglobal::colorProviderWarning()
{
const QLatin1String expected("Warning: QQml_colorProvider: no color provider has been set! ");