Changeset 846 for trunk/src/activeqt/container/qaxbase.cpp
- Timestamp:
- May 5, 2011, 5:36:53 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.7.2 (added) merged: 845 /branches/vendor/nokia/qt/current merged: 844 /branches/vendor/nokia/qt/4.6.3 removed
- Property svn:mergeinfo changed
-
trunk/src/activeqt/container/qaxbase.cpp
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) … … 1354 1354 1355 1355 // There seams to be a naming problem in mingw headers 1356 #ifdef Q_CC_GNU 1357 #ifndef COAUTHIDENTITY 1356 #if defined(Q_CC_GNU) && !defined(COAUTHIDENTITY) && !defined(__MINGW64_VERSION_MAJOR) 1358 1357 #define COAUTHIDENTITY AUTH_IDENTITY 1359 #endif1360 1358 #endif 1361 1359 … … 1674 1672 switch(vartype) { 1675 1673 case QVariant::Invalid: 1674 1676 1675 if (prop.type == "QVariant") { 1677 1676 prop.typeId |= 0xff << 24; 1678 1677 break; 1679 1678 } 1680 // fall through1681 case QVariant::UserType:1682 1679 if (QMetaType::type(prop.type) == -1) 1683 1680 qWarning("QAxBase: Unsupported property type: %s", prop.type.data()); … … 2544 2541 } 2545 2542 if (funcdesc->invkind == INVOKE_PROPERTYPUT) { 2543 2544 2545 2546 2547 2546 2548 QByteArray set; 2547 2549 if (isupper(prototype.at(0))) {
Note:
See TracChangeset
for help on using the changeset viewer.