diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-05-13 15:55:50 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-05-13 15:55:50 (GMT) |
| commit | 4adf280fb6bda8e519bf23606b841e040cb04fab (patch) | |
| tree | 88eda2f4f5cf46c9e68fa4aea7ca832aaa6c65db /src/activeqt | |
| parent | d9ef2f580bd78e658064e4fa3d0acf73b9c2a921 (diff) | |
| parent | f32438ffccd8728143b93399e7cd251e72d23b55 (diff) | |
| download | Qt-4adf280fb6bda8e519bf23606b841e040cb04fab.zip Qt-4adf280fb6bda8e519bf23606b841e040cb04fab.tar.gz Qt-4adf280fb6bda8e519bf23606b841e040cb04fab.tar.bz2 | |
Merge branch '4.8'
Conflicts:
doc/src/declarative/whatsnew.qdoc
doc/src/examples/orientation.qdoc
doc/src/examples/webftpclient.qdoc
examples/declarative/ui-components/main/qml/pics/niagara_falls.jpg
src/corelib/global/qglobal.cpp
src/gui/text/qglyphs.cpp
src/gui/text/qplatformfontdatabase_qpa.cpp
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; |