Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6

5 files changed, 12 insertions, 6 deletions

diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp
index b64d7df..4742e54 100644
--- a/src/corelib/animation/qpropertyanimation.cpp
+++ b/src/corelib/animation/qpropertyanimation.cpp
@@ -132,9 +132,9 @@ void QPropertyAnimationPrivate::updateProperty(const QVariant &newValue)
     }
 
     if (newValue.userType() == propertyType) {
-        //no conversion is needed, we directly call the QObject::qt_metacall
+        //no conversion is needed, we directly call the QMetaObject::metacall
         void *data = const_cast<void*>(newValue.constData());
-        targetValue->qt_metacall(QMetaObject::WriteProperty, propertyIndex, &data);
+        QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, &data);
     } else {
         targetValue->setProperty(propertyName.constData(), newValue);
     }
diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h
index c95537b..69dcc8a 100644
--- a/src/dbus/qdbusextratypes.h
+++ b/src/dbus/qdbusextratypes.h
@@ -174,6 +174,9 @@ inline  QDBusVariant::QDBusVariant(const QVariant &dBusVariant)
 inline void QDBusVariant::setVariant(const QVariant &dBusVariant)
 { QVariant::operator=(dBusVariant); }
 
+inline bool operator==(const QDBusVariant &v1, const QDBusVariant &v2)
+{ return v1.variant() == v2.variant(); }
+
 QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QDBusVariant)
diff --git a/src/gui/image/qpixmap_x11.cpp b/src/gui/image/qpixmap_x11.cpp
index 6cde898..92a7e7d 100644
--- a/src/gui/image/qpixmap_x11.cpp
+++ b/src/gui/image/qpixmap_x11.cpp
@@ -1252,8 +1252,11 @@ void QX11PixmapData::release()
 
 QPixmap QX11PixmapData::alphaChannel() const
 {
-    if (!hasAlphaChannel())
-        return QPixmap();
+    if (!hasAlphaChannel()) {
+        QPixmap pm(w, h);
+        pm.fill(Qt::white);
+        return pm;
+    }
     QImage im(toImage());
     return QPixmap::fromImage(im.alphaChannel(), Qt::OrderedDither);
 }
diff --git a/src/gui/kernel/qformlayout.cpp b/src/gui/kernel/qformlayout.cpp
index 6ceab07..3e5dadc 100644
--- a/src/gui/kernel/qformlayout.cpp
+++ b/src/gui/kernel/qformlayout.cpp
@@ -252,7 +252,7 @@ QFormLayoutPrivate::QFormLayoutPrivate()
     : fieldGrowthPolicy(DefaultFieldGrowthPolicy),
       rowWrapPolicy(DefaultRowWrapPolicy), has_hfw(false), dirty(true), sizesDirty(true),
       expandVertical(0), expandHorizontal(0), labelAlignment(0), formAlignment(0),
-      hfw_width(-1), hfw_sh_height(-1), min_width(-1),
+      layoutWidth(-1), hfw_width(-1), hfw_sh_height(-1), min_width(-1),
       sh_width(-1), thresh_width(QLAYOUTSIZE_MAX), hSpacing(-1), vSpacing(-1)
 {
 }
diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp
index da490c0..3e4a8e7 100644
--- a/src/opengl/qpaintengine_opengl.cpp
+++ b/src/opengl/qpaintengine_opengl.cpp
@@ -2311,7 +2311,7 @@ void QOpenGLPaintEnginePrivate::updateDepthClip()
 void QOpenGLPaintEnginePrivate::systemStateChanged()
 {
     Q_Q(QOpenGLPaintEngine);
-    if (q->state()->hasClipping)
+    if (q->painter()->hasClipping())
         q->updateClipRegion(q->painter()->clipRegion(), Qt::ReplaceClip);
     else
         q->updateClipRegion(QRegion(), Qt::NoClip);