summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qnamespace.qdoc
diff options
context:
space:
mode:
authorJan-Arve Sæther <jan-arve.saether@nokia.com>2011-03-16 08:44:44 (GMT)
committerJan-Arve Sæther <jan-arve.saether@nokia.com>2011-03-16 08:44:44 (GMT)
commit245e0454a82a0fba7a1605320acf6b231c8d4205 (patch)
tree8e1ccd930b22a82c45e77b452bb5f0a230c499d1 /src/corelib/global/qnamespace.qdoc
parent517290f73be74d1cf08fbd603870d3dacc379ff3 (diff)
parentb18bd68dd05f000c65e33a975bca6bf24dabb8d3 (diff)
downloadQt-245e0454a82a0fba7a1605320acf6b231c8d4205.zip
Qt-245e0454a82a0fba7a1605320acf6b231c8d4205.tar.gz
Qt-245e0454a82a0fba7a1605320acf6b231c8d4205.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7
Diffstat (limited to 'src/corelib/global/qnamespace.qdoc')
-rw-r--r--src/corelib/global/qnamespace.qdoc11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 65cd7f4..a79411b 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
*/
@@ -732,6 +739,10 @@
until a non-opaque pixel is found, or if you want the pixmap to
retain an alpha channel for some other reason. If the image has no
alpha channel this flag has no effect.
+
+ \omitvalue NoFormatConversion Don't do any format conversions on the image.
+ Can be useful when converting a QImage to a QPixmap for a one-time
+ rendering operation for example.
*/
/*! \enum Qt::GUIStyle