Changeset 651 for trunk/src/gui/dialogs/qdialog.cpp
- Timestamp:
- Mar 8, 2010, 12:52:58 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.6.2 (added) merged: 650 /branches/vendor/nokia/qt/current merged: 649 /branches/vendor/nokia/qt/4.6.1 removed
- Property svn:mergeinfo changed
-
trunk/src/gui/dialogs/qdialog.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) … … 266 266 setWindowFlags(windowFlags() | Qt::WindowOkButtonHint | QFlag(qt_wince_is_mobile() ? 0 : Qt::WindowCancelButtonHint)); 267 267 #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 268 276 } 269 277 … … 294 302 if (!qt_wince_is_smartphone()) 295 303 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 } 296 312 #endif 297 313 }
Note:
See TracChangeset
for help on using the changeset viewer.