Merge remote branch 'origin/4.6' into qt-master-from-4.6

Conflicts:
	examples/assistant/simpletextviewer/findfiledialog.cpp
	qmake/generators/symbian/symmake.cpp
	tools/assistant/lib/qhelpgenerator.cpp
	tools/assistant/lib/qhelpsearchquerywidget.cpp
	translations/translations.pri

2 files changed, 16 insertions, 2 deletions

diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 38e1886..177bee4 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -497,6 +497,9 @@ public:
         WA_WState_AcceptedTouchBeginEvent = 122,
         WA_TouchPadAcceptSingleTouchEvents = 123,
 
+        WA_MergeSoftkeys =  124,
+        WA_MergeSoftkeysRecursively =  125,
+
         // Add new attributes before this line
         WA_AttributeCount
     };
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 871dd5c..6627c76 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -524,11 +524,11 @@
        	   receiver are in the same thread. Same as QueuedConnection,
        	   if the emitter and receiver are in different threads.
 
-    \value DirectConnection  
+    \value DirectConnection
 	   The slot is invoked immediately, when the signal is
        	   emitted.
 
-    \value QueuedConnection  
+    \value QueuedConnection
     	   The slot is invoked when control returns to the event loop
        	   of the receiver's thread. The slot is executed in the
        	   receiver's thread.
@@ -1243,6 +1243,17 @@
     \value WA_TouchPadAcceptSingleTouchEvents Allows touchpad single
     touch events to be sent to the widget.
 
+    \value WA_MergeSoftkeys Allows widget to merge softkeys with parent widget,
+    i.e. widget can set only one softkeys and request softkey implementation
+    to take rest of the softkeys from the parent. Note parents are traversed until
+    WA_MergeSoftkeys is not set. See also Qt::WA_MergeSoftkeysRecursively
+    This attribute currently has effect only on Symbian platforms
+
+    \value WA_MergeSoftkeysRecursively Allows widget to merge softkeys recursively
+    with all parents. If this attribute is set, the widget parents are traversed until
+    window boundary (widget without parent or dialog) is found.
+    This attribute currently has effect only on Symbian platforms
+
     \omitvalue WA_SetLayoutDirection
     \omitvalue WA_InputMethodTransparent
     \omitvalue WA_WState_CompressKeys