Ignore:
Timestamp:
Mar 8, 2010, 12:52:58 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.2 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/gui/dialogs/qdialog.cpp

    r561 r651  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
     
    266266        setWindowFlags(windowFlags() | Qt::WindowOkButtonHint | QFlag(qt_wince_is_mobile() ? 0 : Qt::WindowCancelButtonHint));
    267267#endif
     268
     269#ifdef Q_WS_S60
     270    if (S60->avkonComponentsSupportTransparency) {
     271        bool noSystemBackground = testAttribute(Qt::WA_NoSystemBackground);
     272        setAttribute(Qt::WA_TranslucentBackground); // also sets WA_NoSystemBackground
     273        setAttribute(Qt::WA_NoSystemBackground, noSystemBackground); // restore system background attribute
     274    }
     275#endif
    268276}
    269277
     
    294302    if (!qt_wince_is_smartphone())
    295303        setWindowFlags(windowFlags() | Qt::WindowOkButtonHint | QFlag(qt_wince_is_mobile() ? 0 : Qt::WindowCancelButtonHint));
     304#endif
     305
     306#ifdef Q_WS_S60
     307    if (S60->avkonComponentsSupportTransparency) {
     308        bool noSystemBackground = testAttribute(Qt::WA_NoSystemBackground);
     309        setAttribute(Qt::WA_TranslucentBackground); // also sets WA_NoSystemBackground
     310        setAttribute(Qt::WA_NoSystemBackground, noSystemBackground); // restore system background attribute
     311    }
    296312#endif
    297313}
Note: See TracChangeset for help on using the changeset viewer.