diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-02 12:20:42 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-02 12:20:42 (GMT) |
| commit | 8abaeb826c5fdb5bb872b27b3f411e63d63a12ff (patch) | |
| tree | ca002b2327fbd8dd60220198c78173740a550550 /src/activeqt | |
| parent | ab29e9f1ab52901a5ed98055cf203817d2248dd2 (diff) | |
| parent | 43503e38d91c0e8375c2d5993de201419ba854ec (diff) | |
| download | Qt-8abaeb826c5fdb5bb872b27b3f411e63d63a12ff.zip Qt-8abaeb826c5fdb5bb872b27b3f411e63d63a12ff.tar.gz Qt-8abaeb826c5fdb5bb872b27b3f411e63d63a12ff.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
Diffstat (limited to 'src/activeqt')
| -rw-r--r-- | src/activeqt/shared/qaxtypes.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/activeqt/shared/qaxtypes.cpp b/src/activeqt/shared/qaxtypes.cpp index c48b55b..8835caf 100644 --- a/src/activeqt/shared/qaxtypes.cpp +++ b/src/activeqt/shared/qaxtypes.cpp @@ -265,7 +265,7 @@ bool QVariantToVARIANT(const QVariant &var, VARIANT &arg, const QByteArray &type return QVariantToVARIANT(var, *arg.pvarVal, typeName, false); } - if (out && proptype == QVariant::Invalid && typeName == "QVariant") { + if (out && proptype == QVariant::UserType && typeName == "QVariant") { VARIANT *pVariant = new VARIANT; QVariantToVARIANT(var, *pVariant, QByteArray(), false); arg.vt = VT_VARIANT|VT_BYREF; |