diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-09 04:02:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-09 04:02:18 (GMT) |
| commit | ec82a2e2c596fd623c58a4a003dd2e7603931993 (patch) | |
| tree | c2cabcd9f3c2c06269a59ab57d548ddc5c29a275 /src/corelib/global | |
| parent | 4596db451cd2c53768e42b00a4234e7de2149f39 (diff) | |
| parent | d3db719f8dce8abfa81c39f54d0fd58b4e75a1ca (diff) | |
| download | Qt-ec82a2e2c596fd623c58a4a003dd2e7603931993.zip Qt-ec82a2e2c596fd623c58a4a003dd2e7603931993.tar.gz Qt-ec82a2e2c596fd623c58a4a003dd2e7603931993.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: (23 commits)
Fixed build breakage on S60 3.1 due to audio effects changes
Added a flag to avoid construction of application panes.
Fixed QDesktopWidget autotest.
Fixed a doc error.
Enable building with MSVC2008
Added mention of Symbian binary packages to INSTALL file
Fix for QTBUG-5870 QGraphicsProxyWidget does not show children on
Deploy sqlite3.sis instead of sqlite3.dll in Symbian
Separated "make run" and "make runonphone" targets
Added UIDs and icons to some webkit examples
Implemented node disconnection in Phonon MMF backend
Removed dead code from Phonon MMF backend
Re-emit prefinishMarkReached and aboutToFinish if rewound back past mark.
Implemented support for playlist handling in Phonon MMF backend
Mediaplayer: enqueue all entries from .ram file before starting playback
Changed call sequence of seeking in Phonon MMF backend, for streaming
Implemented buffer status notifications in Phonon MMF backend
Added support for streaming playback to Phonon MMF backend
Phonon MMF: leaves during object construction throw exceptions
Removed stale TODO comments from Phonon MMF backend
...
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 1 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 0ee9cd2..c40308c 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -511,6 +511,7 @@ public: AA_MacPluginApplication = 5, AA_DontUseNativeMenuBar = 6, AA_MacDontSwapCtrlAndMeta = 7, + AA_S60DontConstructApplicationPanes = 8, // Add new attributes before this line AA_AttributeCount diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 7ee7a76..5a80d56 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -134,7 +134,6 @@ \value AA_DontShowIconsInMenus Actions with the Icon property won't be shown in any menus unless specifically set by the QAction::iconVisibleInMenu property. - Menus that are currently open or menus already created in the native Mac OS X menubar \e{may not} pick up a change in this attribute. Changes in the QAction::iconVisibleInMenu property will always be picked up. @@ -164,6 +163,12 @@ Command+C on the keyboard regardless of the value set, though what is output for QKeySequence::toString(QKeySequence::PortableText) will be different). + \value AA_S60DontConstructApplicationPanes Stops Qt from initializing the S60 status + pane and softkey pane on Symbian. This is useful to save memory and reduce + startup time for applications that will run in fullscreen mode during their + whole lifetime. This attribute must be set before QApplication is + constructed. + \omitvalue AA_AttributeCount */ |