Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/activeqt/container/qaxbase.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
     
    13541354
    13551355// 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)
    13581357#define COAUTHIDENTITY AUTH_IDENTITY
    1359 #endif
    13601358#endif
    13611359
     
    16741672        switch(vartype) {
    16751673        case QVariant::Invalid:
     1674
    16761675            if (prop.type == "QVariant") {
    16771676                prop.typeId |= 0xff << 24;
    16781677                break;
    16791678            }
    1680             // fall through
    1681         case QVariant::UserType:
    16821679            if (QMetaType::type(prop.type) == -1)
    16831680                qWarning("QAxBase: Unsupported property type: %s", prop.type.data());
     
    25442541            }
    25452542            if (funcdesc->invkind == INVOKE_PROPERTYPUT) {
     2543
     2544
     2545
     2546
     2547
    25462548                QByteArray set;
    25472549                if (isupper(prototype.at(0))) {
Note: See TracChangeset for help on using the changeset viewer.