From 56265031b763736163f1a229a7e7e6b7aaec8a36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Mon, 30 Jan 2012 12:21:43 +0100 Subject: Align QVariant::UserType and QMetaType::User MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Lars Knoll Reviewed-by: João Abecasis Reviewed-by: Andrew Stanley-Jones Reviewed-by: Aaron Kennedy --- dist/changes-5.0.0 | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'dist') 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 -- cgit v1.2.3