diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-29 11:56:49 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-29 11:56:49 (GMT) |
| commit | 43503e38d91c0e8375c2d5993de201419ba854ec (patch) | |
| tree | 1fcc9e7be6ce0556c015d15077d07a537888bb7f /src | |
| parent | 26c6d79e21ef614b8dc6ec325b5a2a59c7027637 (diff) | |
| parent | 0670770e98e3f914bd221205e1f4ec144b0757fb (diff) | |
| download | Qt-43503e38d91c0e8375c2d5993de201419ba854ec.zip Qt-43503e38d91c0e8375c2d5993de201419ba854ec.tar.gz Qt-43503e38d91c0e8375c2d5993de201419ba854ec.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix another case where QVariant::Invalid should be QVariant::UserType
Diffstat (limited to 'src')
| -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 f0a8ad8..b741620 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; |