Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Make tablet detection work with new wacom drivers
  Fixed an exit crash that could occur in the GL 2 engine under X11.
  Fix tst_QVariant::operator_eq_eq(UserType)
  SqlBrowser not respecting casings.
  Remove vgClearPath() change to OpenVG paint engine
  QVariant: Fix crash when comparing two variant with the same undefined type.
  Fix compositing when QWS background is completely transparent.
  Fixes wrong composition mode for cached backgrounds in Graphics View.
  Support keypad input with vnc driver

1 files changed, 5 insertions, 1 deletions

diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index e1b5825..9a278bd 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -466,9 +466,13 @@ static bool compare(const QVariant::Private *a, const QVariant::Private *b)
      * QMetaType::VoidStar, QMetaType::QObjectStar and so forth, is that it wouldn't include
      * user defined pointer types. */
     const char *const typeName = QMetaType::typeName(a->type);
-    if (typeName[qstrlen(typeName) - 1] == '*')
+    uint typeNameLen = qstrlen(typeName);
+    if (typeNameLen > 0 && typeName[typeNameLen - 1] == '*')
         return *static_cast<void *const *>(a_ptr) == *static_cast<void *const *>(b_ptr);
 
+    if (a->is_null && b->is_null)
+        return true;
+
     return a_ptr == b_ptr;
 }