Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-multitouch

1 files changed, 4 insertions, 11 deletions

diff --git a/doc/src/qnamespace.qdoc b/doc/src/qnamespace.qdoc
index 4559571..818af05 100644
--- a/doc/src/qnamespace.qdoc
+++ b/doc/src/qnamespace.qdoc
@@ -129,13 +129,8 @@
            Therefore, if it is important to minimize resource
            consumption, do not set this attribute.
 
-    \value AA_MSWindowsUseDirect3DByDefault Is a Windows specific
-           attribute, that will make the Direct3D paint engine the
-           default Qt widget paint engine.  Note that you can toggle
-           usage of the Direct3D engine on individual QWidgets by
-           setting/clearing the \c WA_MSWindowsUseDirect3D attribute
-           on a specific widget. \bold {This functionality is
-           experimental}.
+    \value AA_MSWindowsUseDirect3DByDefault This value is obsolete and
+           has no effect.
 
     \value AA_DontShowIconsInMenus Actions with the Icon property won't be
            shown in any menus unless specifically set by the
@@ -948,10 +943,8 @@
     position. This is set/cleared by QWidget::move() and
     by QWidget::setGeometry().
 
-    \value WA_MSWindowsUseDirect3D Makes drawing to a widget
-    with this attribute set use the Direct3D paint engine, if the
-    Direct3D paint engine is available. \bold {This functionality
-    is experimental.}
+    \value WA_MSWindowsUseDirect3D This value is obsolete and has no
+    effect.
 
     \value WA_NoBackground This value is obsolete. Use
     WA_OpaquePaintEvent instead.