summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorJędrzej Nowacki <jedrzej.nowacki@nokia.com>2012-01-30 12:21:43 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-07 08:52:32 +0100
commit56265031b763736163f1a229a7e7e6b7aaec8a36 (patch)
tree74adf46c46a98ddda122f7bcc150af67af2388a1 /dist
parenta6505007295c7363ef1b0ee4aa81d15a2b470a7e (diff)
Align QVariant::UserType and QMetaType::User
There is no point in keeping separate values which should mean the same. QVariant::UserType was used also to construct a valid, null QVariant, containing an instance of unknown custom type. The concept was strange and useless as there was no operation that could be done on such QVariant. Therefore it was dropped. Please note that the patch slightly changes behavior of different functions accepting a type id as parameter. Before QVariant::UserType was an invalid type from QMetaType perspective (id 127 was not assigned to any built-in type), but QMetaType::User points to the first registered custom type. Change-Id: I5c7d541a9affdcdacf53a4eda2272bdafaa87b71 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'dist')
-rw-r--r--dist/changes-5.0.07
1 files changed, 7 insertions, 0 deletions
diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0
index fc5bebd11d..280b5d93f9 100644
--- a/dist/changes-5.0.0
+++ b/dist/changes-5.0.0
@@ -437,6 +437,13 @@ Qt for Windows CE
cause an abort().
+- QVariant
+
+ * Definition of QVariant::UserType changed. Currently it is the same as
+ QMetaType::User, which means that it points to the first registered custom
+ type, instead of a nonexistent type.
+
+
- QMessageBox
* The static function QMessageBox::question has changed the default argument