diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-16 16:49:39 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-16 16:49:39 (GMT) |
| commit | 6e323d672ce679b253eb1d49bac1669349067a7b (patch) | |
| tree | e57922018583431aac7d8b9b5154422c9b9699c5 /src/corelib/global | |
| parent | 770d5468a87c84cc435eefaa2a234f8c3b87f8c2 (diff) | |
| parent | 48e7ac0eee8beb9d2c597ff5fa3c913d56ffb9b0 (diff) | |
| download | Qt-6e323d672ce679b253eb1d49bac1669349067a7b.zip Qt-6e323d672ce679b253eb1d49bac1669349067a7b.tar.gz Qt-6e323d672ce679b253eb1d49bac1669349067a7b.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:
Made Q_ASSERT meaningful again
Introduce new flag for splitview support in Symbian
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, 8 insertions, 0 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index e492345..398f9bf 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -541,6 +541,7 @@ public: AA_DontUseNativeMenuBar = 6, AA_MacDontSwapCtrlAndMeta = 7, AA_S60DontConstructApplicationPanes = 8, + AA_S60DisablePartialScreenInputMode = 9, // Add new attributes before this line AA_AttributeCount diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 65cd7f4..d617f77 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -156,6 +156,13 @@ whole lifetime. This attribute must be set before QApplication is constructed. + \omitvalue AA_S60DisablePartialScreenInputMode By default in Symbian^3, + a separate editing window is opened on top of an application. This is exactly + like editing on previous versions of Symbian behave. When this attribute + is true, a virtual keyboard window is shown on top of application and it + is ensured that the focused text widget is visible. This is only supported in + Symbian^3. (internal) + \omitvalue AA_AttributeCount */ |