Changeset 846 for trunk/src/activeqt/container/qaxbase.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/activeqt/container/qaxbase.cpp (modified) (4 diffs)

trunk/src/activeqt/container/qaxbase.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -1354 +1354 @@
 
 // There seams to be a naming problem in mingw headers
-#ifdef Q_CC_GNU
-#ifndef COAUTHIDENTITY
+#if defined(Q_CC_GNU) && !defined(COAUTHIDENTITY) && !defined(__MINGW64_VERSION_MAJOR)
 #define COAUTHIDENTITY AUTH_IDENTITY
-#endif
 #endif
 
@@ -1674 +1672 @@
         switch(vartype) {
         case QVariant::Invalid:
+
             if (prop.type == "QVariant") {
                 prop.typeId |= 0xff << 24;
                 break;
             }
-            // fall through
-        case QVariant::UserType:
             if (QMetaType::type(prop.type) == -1)
                 qWarning("QAxBase: Unsupported property type: %s", prop.type.data());
@@ -2544 +2541 @@
             }
             if (funcdesc->invkind == INVOKE_PROPERTYPUT) {
+
+
+
+
+
                 QByteArray set;
                 if (isupper(prototype.at(0))) {