Merge branch '4.7-upstream' into 4.7-water

8 files changed, 87 insertions, 52 deletions

diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp
index fd4b9c1..dbb333f 100644
--- a/src/corelib/io/qdiriterator.cpp
+++ b/src/corelib/io/qdiriterator.cpp
@@ -389,9 +389,6 @@ QDirIterator::QDirIterator(const QDir &dir, IteratorFlags flags)
     \note To list symlinks that point to non existing files, QDir::System must be
      passed to the flags.
 
-    \warning This constructor expects \a flags to be left at its default value. Use
-             the constructors that do not take the \a filters argument instead.
-
     \sa hasNext(), next(), IteratorFlags
 */
 QDirIterator::QDirIterator(const QString &path, QDir::Filters filters, IteratorFlags flags)
@@ -429,9 +426,6 @@ QDirIterator::QDirIterator(const QString &path, IteratorFlags flags)
     \note To list symlinks that point to non existing files, QDir::System must be
      passed to the flags.
 
-    \warning This constructor expects \c flags to be left at its default value. Use the
-             constructors that do not take the \a filters argument instead.
-
     \sa hasNext(), next(), IteratorFlags
 */
 QDirIterator::QDirIterator(const QString &path, const QStringList &nameFilters,
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index ce9c57e..b45710c 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -187,7 +187,7 @@ Q_GLOBAL_STATIC(QStringList, resourceSearchPaths)
     A QResource can either be loaded with an absolute path, either treated
     as a file system rooted with a \c{/} character, or in resource notation
     rooted with a \c{:} character. A relative resource can also be opened
-    which will be found through the searchPaths().
+    which will be found in the list of paths returned by QDir::searchPaths().
 
     A QResource that is representing a file will have data backing it, this
     data can possibly be compressed, in which case qUncompress() must be
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp
index 83d6dcd..b817eb2 100644
--- a/src/corelib/tools/qlocale.cpp
+++ b/src/corelib/tools/qlocale.cpp
@@ -1576,8 +1576,6 @@ QDataStream &operator>>(QDataStream &ds, QLocale &l)
        defaults to the default locale (see setDefault()).
     \endlist
 
-    The "C" locale is identical in behavior to \l{English}/\l{UnitedStates}.
-
     Use language() and country() to determine the actual language and
     country values used.
 
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 75e4a0b..24d9b03 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -454,10 +454,18 @@ void QDeclarativeItemKeyFilter::componentComplete()
     \qmlproperty Item KeyNavigation::down
 
     These properties hold the item to assign focus to
-    when Key_Left, Key_Right, Key_Up or Key_Down are
+    when the left, right, up or down cursor keys are
     pressed.
 */
 
+/*!
+    \qmlproperty Item KeyNavigation::tab
+    \qmlproperty Item KeyNavigation::backtab
+
+    These properties hold the item to assign focus to
+    when the Tab key or Shift+Tab key combination (Backtab) are pressed.
+*/
+
 QDeclarativeKeyNavigationAttached::QDeclarativeKeyNavigationAttached(QObject *parent)
 : QObject(*(new QDeclarativeKeyNavigationAttachedPrivate), parent),
   QDeclarativeItemKeyFilter(qobject_cast<QDeclarativeItem*>(parent))
@@ -911,6 +919,20 @@ void QDeclarativeKeyNavigationAttached::keyReleased(QKeyEvent *event, bool post)
 */
 
 /*!
+    \qmlsignal Keys::onTabPressed(KeyEvent event)
+
+    This handler is called when the Tab key has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onBacktabPressed(KeyEvent event)
+
+    This handler is called when the Shift+Tab key combination (Backtab) has
+    been pressed. The \a event parameter provides information about the event.
+*/
+
+/*!
     \qmlsignal Keys::onAsteriskPressed(KeyEvent event)
 
     This handler is called when the Asterisk '*' has been pressed. The \a event
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index f2e6217..dd7e5fd 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -1324,7 +1324,7 @@ void QDeclarativeVector3dAnimation::setTo(QVector3D t)
 
 /*!
     \qmlclass RotationAnimation QDeclarativeRotationAnimation
-  \ingroup qml-animation-transition
+    \ingroup qml-animation-transition
     \since 4.7
     \inherits PropertyAnimation
     \brief The RotationAnimation element animates changes in rotation values.
@@ -1333,8 +1333,8 @@ void QDeclarativeVector3dAnimation::setTo(QVector3D t)
     over the direction of rotation during an animation. 
 
     By default, it rotates in the direction
-    of the numerical change; a rotation from 0 to 240 will rotate 220 degrees
-    clockwise, while a rotation from 240 to 0 will rotate 220 degrees
+    of the numerical change; a rotation from 0 to 240 will rotate 240 degrees
+    clockwise, while a rotation from 240 to 0 will rotate 240 degrees
     counterclockwise. The \l direction property can be set to specify the
     direction in which the rotation should occur.
 
@@ -1342,7 +1342,7 @@ void QDeclarativeVector3dAnimation::setTo(QVector3D t)
     between states via the shortest path:
 
     \snippet doc/src/snippets/declarative/rotationanimation.qml 0
-    
+
     Notice the RotationAnimation did not need to set a \l target
     value. As a convenience, when used in a transition, RotationAnimation will rotate all
     properties named "rotation" or "angle". You can override this by providing
diff --git a/src/declarative/util/qdeclarativeview.cpp b/src/declarative/util/qdeclarativeview.cpp
index 0e31a20..c22f200 100644
--- a/src/declarative/util/qdeclarativeview.cpp
+++ b/src/declarative/util/qdeclarativeview.cpp
@@ -192,7 +192,7 @@ void QDeclarativeViewPrivate::itemGeometryChanged(QDeclarativeItem *resizeItem,
 
 /*!
     \class QDeclarativeView
-  \since 4.7
+    \since 4.7
     \brief The QDeclarativeView class provides a widget for displaying a Qt Declarative user interface.
 
     QDeclarativeItem objects can be placed on a standard QGraphicsScene and 
@@ -360,13 +360,14 @@ QDeclarativeContext* QDeclarativeView::rootContext() const
 }
 
 /*!
-  \enum QDeclarativeView::Status
+    \enum QDeclarativeView::Status
     Specifies the loading status of the QDeclarativeView.
 
     \value Null This QDeclarativeView has no source set.
     \value Ready This QDeclarativeView has loaded and created the QML component.
     \value Loading This QDeclarativeView is loading network data.
-    \value Error An error has occurred.  Call errorDescription() to retrieve a description.
+    \value Error One or more errors has occurred. Call errors() to retrieve a list
+           of errors.
 */
 
 /*! \enum QDeclarativeView::ResizeMode
diff --git a/src/gui/dialogs/qfiledialog_symbian.cpp b/src/gui/dialogs/qfiledialog_symbian.cpp
index 1f70305..1fc5f5e 100644
--- a/src/gui/dialogs/qfiledialog_symbian.cpp
+++ b/src/gui/dialogs/qfiledialog_symbian.cpp
@@ -64,7 +64,7 @@ public:
         filterList.clear();
         if (filter.left(2) == QLatin1String("*.")) {
             //Filter has only extensions
-            filterList << filter.split(" ");
+            filterList << filter.split(QLatin1String(" "));
             return;
         } else {
             //Extensions are in parenthesis and there may be several filters
@@ -75,7 +75,7 @@ public:
                     return;
                 }
             }
-            QRegExp rx("\\(([^\\)]*)\\)");
+            QRegExp rx(QLatin1String("\\(([^\\)]*)\\)"));
             int pos = 0;
             while ((pos = rx.indexIn(filter, pos)) != -1) {
                 filterList << rx.cap(1).split(QLatin1String(" "));
@@ -119,36 +119,49 @@ static QString launchSymbianDialog(const QString dialogCaption, const QString st
 {
     QString selection;
 #if defined(Q_WS_S60) && defined(SYMBIAN_VERSION_SYMBIAN3)
-    QT_TRAP_THROWING(
-        TFileName startFolder;
-        if (!startDirectory.isEmpty()) {
-            QString dir = QDir::toNativeSeparators(startDirectory);
+    TFileName startFolder;
+    if (!startDirectory.isEmpty()) {
+        QString dir = QDir::toNativeSeparators(QFileDialogPrivate::workingDirectory(startDirectory));
+        startFolder = qt_QString2TPtrC(dir);
+    }
+    TInt types = AknCommonDialogsDynMem::EMemoryTypeMMCExternal|
+                 AknCommonDialogsDynMem::EMemoryTypeInternalMassStorage|
+                 AknCommonDialogsDynMem::EMemoryTypePhone;
+
+    TPtrC titlePtr(qt_QString2TPtrC(dialogCaption));
+    TFileName target;
+    bool select = false;
+    int tryCount = 2;
+    while (tryCount--) {
+        TInt err(KErrNone);
+        TRAP(err,
+            if (dialogMode == DialogOpen) {
+                CExtensionFilter* extensionFilter = new (ELeave) CExtensionFilter;
+                CleanupStack::PushL(extensionFilter);
+                extensionFilter->setFilter(filter);
+                select = AknCommonDialogsDynMem::RunSelectDlgLD(types, target,
+                         startFolder, NULL, NULL, titlePtr, extensionFilter);
+                CleanupStack::Pop(extensionFilter);
+            } else if (dialogMode == DialogSave) {
+                select = AknCommonDialogsDynMem::RunSaveDlgLD(types, target,
+                         startFolder, NULL, NULL, titlePtr);
+            } else if (dialogMode == DialogFolder) {
+                select = AknCommonDialogsDynMem::RunFolderSelectDlgLD(types, target, startFolder,
+                            0, 0, titlePtr, NULL, NULL);
+            }
+        );
+
+        if (err == KErrNone) {
+            tryCount = 0;
+        } else {
+            // Symbian native file dialog doesn't allow accessing files outside C:/Data
+            // It will always leave in that case, so default into QDir::rootPath() in error cases.
+            QString dir = QDir::toNativeSeparators(QDir::rootPath());
             startFolder = qt_QString2TPtrC(dir);
         }
-        TInt types = AknCommonDialogsDynMem::EMemoryTypeMMCExternal|
-                     AknCommonDialogsDynMem::EMemoryTypeInternalMassStorage|
-                     AknCommonDialogsDynMem::EMemoryTypePhone;
-
-        TPtrC titlePtr(qt_QString2TPtrC(dialogCaption));
-        TFileName target;
-        bool select = false;
-        if (dialogMode == DialogOpen) {
-            CExtensionFilter* extensionFilter = new (ELeave) CExtensionFilter;
-            CleanupStack::PushL(extensionFilter);
-            extensionFilter->setFilter(filter);
-            select = AknCommonDialogsDynMem::RunSelectDlgLD(types, target,
-                     startFolder, NULL, NULL, titlePtr, extensionFilter);
-            CleanupStack::Pop(extensionFilter);
-        } else if (dialogMode == DialogSave) {
-            select = AknCommonDialogsDynMem::RunSaveDlgLD(types, target,
-                     startFolder, NULL, NULL, titlePtr);
-        } else if (dialogMode == DialogFolder) {
-            select = AknCommonDialogsDynMem::RunFolderSelectDlgLD(types, target, startFolder,
-                        0, 0, titlePtr, NULL, NULL);
-        }
-        if (select)
-            selection.append(qt_TDesC2QString(target));
-    );
+    }
+    if (select)
+        selection.append(qt_TDesC2QString(target));
 #endif
     return selection;
 }
diff --git a/src/gui/widgets/qdockwidget.cpp b/src/gui/widgets/qdockwidget.cpp
index df9b171..0a6269d 100644
--- a/src/gui/widgets/qdockwidget.cpp
+++ b/src/gui/widgets/qdockwidget.cpp
@@ -1531,8 +1531,11 @@ QAction * QDockWidget::toggleViewAction() const
 
 /*!
     \since 4.3
+
     Sets an arbitrary \a widget as the dock widget's title bar. If \a widget
-    is 0, the title bar widget is removed, but not deleted.
+    is 0, any custom title bar widget previously set on the dock widget is
+    removed, but not deleted, and the default title bar will be used
+    instead.
 
     If a title bar widget is set, QDockWidget will not use native window
     decorations when it is floated.
@@ -1540,23 +1543,27 @@ QAction * QDockWidget::toggleViewAction() const
     Here are some tips for implementing custom title bars:
 
     \list
-    \i Mouse events that are not explicitly handled by the title bar widget
+    \o Mouse events that are not explicitly handled by the title bar widget
        must be ignored by calling QMouseEvent::ignore(). These events then
        propagate to the QDockWidget parent, which handles them in the usual
        manner, moving when the title bar is dragged, docking and undocking
        when it is double-clicked, etc.
 
-    \i When DockWidgetVerticalTitleBar is set on QDockWidget, the title
+    \o When DockWidgetVerticalTitleBar is set on QDockWidget, the title
        bar widget is repositioned accordingly. In resizeEvent(), the title
        bar should check what orientation it should assume:
        \snippet doc/src/snippets/code/src_gui_widgets_qdockwidget.cpp 0
 
-    \i The title bar widget must have a valid QWidget::sizeHint() and
+    \o The title bar widget must have a valid QWidget::sizeHint() and
        QWidget::minimumSizeHint(). These functions should take into account
        the current orientation of the title bar.
+
+    \o It is not possible to remove a title bar from a dock widget. However,
+       a similar effect can be achieved by setting a default constructed
+       QWidget as the title bar widget.
     \endlist
 
-    Using qobject_cast as shown above, the title bar widget has full access
+    Using qobject_cast() as shown above, the title bar widget has full access
     to its parent QDockWidget. Hence it can perform such operations as docking
     and hiding in response to user actions.