diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-13 04:44:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-13 04:44:26 (GMT) |
| commit | ba3dd5c9c0aed851e4f1ee829c827f8d3bfbd5b3 (patch) | |
| tree | 6fb4bdea43997d57db01c756ec4542a055fba788 /src/corelib | |
| parent | 209c674c8b5012b6b6b42be90e5bd2bfe5fa38f8 (diff) | |
| parent | 60475e93890550f4fb67367980249a21b9346747 (diff) | |
| download | Qt-ba3dd5c9c0aed851e4f1ee829c827f8d3bfbd5b3.zip Qt-ba3dd5c9c0aed851e4f1ee829c827f8d3bfbd5b3.tar.gz Qt-ba3dd5c9c0aed851e4f1ee829c827f8d3bfbd5b3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (21 commits)
Have the backing store destroyed also in special Symbian scenarios.
Use FixNativeOrientation on Symbian when the application wants it.
QS60Style: itemview item with checkbox and text is drawn incorrectly
Revert "Have the backing store destroyed also in special Symbian scenarios."
Add focus frame support in style sheet
Two QListView autotests do not pass on Symbian^3 releases
tst_QStyle::drawItemPixmap test case fails on Symbian^3
Add the auto detection for OpenVG in configure
Add focus frame support in stylesheet
Make QS60Style to support new Tab graphics in new Symbian releases
GraphicsView is not reset if focusItem is not set when keyboard closes
Check the validity of qt_desktopWidget before dereferencing
Labels are not visible in dialogs with all themes (part2)
Labels are not visible in dialogs with all themes
Enable webkit for symbian-gcce in configure
Enable webkit build for the makefile build system with gcce
Add the rules for gcce in do_not_build_as_thumb.prf
Correct some parameters for the makefile build sytem, armcc and gcce
Support QMAKE_LFLAGS.ARMCC and QMAKE_LFLAGS.GCCE in makefile build system
Do not unnecessarily draw application twice in landscape
...
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 2 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 4d70744..15cc809 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -526,6 +526,8 @@ public: WA_X11DoNotAcceptFocus = 132, + WA_SymbianNoSystemRotation = 133, + // Add new attributes before this line WA_AttributeCount }; diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 22ad83b..f03fb25 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -1244,6 +1244,7 @@ \omitvalue WA_SetWindowModality \omitvalue WA_WState_WindowOpacitySet \omitvalue WA_WState_AcceptedTouchBeginEvent + \omitvalue WA_SymbianNoSystemRotation */ /*! \typedef Qt::HANDLE |