Merge remote-tracking branch 'origin/5.10' into dev

Conflicts:
	.qmake.conf
	sc/corelib/io/qfsfileengine_p.h
	src/corelib/io/qstorageinfo_unix.cpp
	src/platformsupport/eglconvenience/qeglpbuffer_p.h
	src/platformsupport/input/libinput/qlibinputkeyboard.cpp
	src/platformsupport/input/libinput/qlibinputpointer.cpp
	src/plugins/platforms/cocoa/qcocoamenu.mm
	src/plugins/platforms/ios/qiosscreen.h
	src/plugins/platforms/ios/qioswindow.h
	src/plugins/platforms/ios/quiview.mm
	src/printsupport/dialogs/qpagesetupdialog_unix_p.h
	src/printsupport/dialogs/qprintpreviewdialog.cpp
	src/printsupport/widgets/qcupsjobwidget_p.h
	src/widgets/widgets/qmenu.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp

Change-Id: Iecb4883122efe97ef0ed850271e6c51bab568e9c

12 files changed, 72 insertions, 56 deletions

diff --git a/examples/widgets/doc/images/graphicssimpleanchorlayout-example.png b/examples/widgets/doc/images/graphicssimpleanchorlayout-example.png
index 543670e05c..e4bed44edf 100644
--- a/examples/widgets/doc/images/graphicssimpleanchorlayout-example.png
+++ b/examples/widgets/doc/images/graphicssimpleanchorlayout-example.png
diff --git a/examples/widgets/doc/images/notepad.png b/examples/widgets/doc/images/notepad.png
new file mode 100644
index 0000000000..40d13269b9
--- /dev/null
+++ b/examples/widgets/doc/images/notepad.png
diff --git a/examples/widgets/doc/images/notepad1.png b/examples/widgets/doc/images/notepad1.png
new file mode 100644
index 0000000000..40d13269b9
--- /dev/null
+++ b/examples/widgets/doc/images/notepad1.png
diff --git a/examples/widgets/doc/images/notepad2.png b/examples/widgets/doc/images/notepad2.png
new file mode 100644
index 0000000000..9cec1f9a58
--- /dev/null
+++ b/examples/widgets/doc/images/notepad2.png
diff --git a/examples/widgets/doc/images/notepad3.png b/examples/widgets/doc/images/notepad3.png
new file mode 100644
index 0000000000..426861ab06
--- /dev/null
+++ b/examples/widgets/doc/images/notepad3.png
diff --git a/examples/widgets/doc/images/notepad4.png b/examples/widgets/doc/images/notepad4.png
new file mode 100644
index 0000000000..fc08eab204
--- /dev/null
+++ b/examples/widgets/doc/images/notepad4.png
diff --git a/examples/widgets/doc/images/notepad_menu.png b/examples/widgets/doc/images/notepad_menu.png
new file mode 100644
index 0000000000..2dd771111a
--- /dev/null
+++ b/examples/widgets/doc/images/notepad_menu.png
diff --git a/examples/widgets/doc/src/configdialog.qdoc b/examples/widgets/doc/src/configdialog.qdoc
deleted file mode 100644
index 9f2cc21adb..0000000000
--- a/examples/widgets/doc/src/configdialog.qdoc
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-    \example dialogs/configdialog
-    \title Config Dialog Example
-    \ingroup examples-dialogs
-
-    \brief The Config Dialog examples shows how a configuration dialog can be created by
-    using an icon view with a stacked widget.
-
-    \image configdialog-example.png
-*/
diff --git a/examples/widgets/doc/src/draggabletext.qdoc b/examples/widgets/doc/src/draggabletext.qdoc
index c4a694028b..97b2f036bd 100644
--- a/examples/widgets/doc/src/draggabletext.qdoc
+++ b/examples/widgets/doc/src/draggabletext.qdoc
@@ -28,6 +28,7 @@
 /*!
     \example draganddrop/draggabletext
     \title Draggable Text Example
+    \brief Illustrates how to drag and drop text between widgets
 
     \brief The Draggable Text example shows how to drag and drop textual data between widgets
     in the same application, and between different applications.
diff --git a/examples/widgets/doc/src/easing.qdoc b/examples/widgets/doc/src/easing.qdoc
index 3a9727d393..807dd72e93 100644
--- a/examples/widgets/doc/src/easing.qdoc
+++ b/examples/widgets/doc/src/easing.qdoc
@@ -34,4 +34,7 @@
 
     \image easing-example.png
 
+    See \l QEasingCurve for a detailed description on how to use the class's
+    functionalities.
+
 */
diff --git a/examples/widgets/doc/src/findfiles.qdoc b/examples/widgets/doc/src/findfiles.qdoc
index b8363dc698..a2eb326519 100644
--- a/examples/widgets/doc/src/findfiles.qdoc
+++ b/examples/widgets/doc/src/findfiles.qdoc
@@ -74,19 +74,23 @@
 
     \snippet dialogs/findfiles/window.cpp 0
 
-    We create the application's buttons using the private \c
-    createButton() function. Then we create the comboboxes associated
-    with the search specifications, using the private \c
-    createComboBox() function. We also create the application's labels
-    before we use the private \c createFilesTable() function to create
-    the table displaying the search results.
+    We create the widgets to build up the UI, and we add them to a main layout
+    using QGridLayout. We have, however, put the \c Find and \c Quit buttons
+    and a stretchable space in a separate \l QHBoxLayout first, to make the
+    buttons appear in the \c Window widget's bottom right corner.
+
+    Alternatively, we could have used Qt Designer to construct a UI file,
+    and \l {uic} to generate this code.
 
     \snippet dialogs/findfiles/window.cpp 1
 
-    Then we add all the widgets to a main layout using QGridLayout. We
-    have, however, put the \c Find and \c Quit buttons and a
-    stretchable space in a separate QHBoxLayout first, to make the
-    buttons appear in the \c Window widget's bottom right corner.
+    We did not create a \l QMenuBar with a \uicontrol Quit menu item; but we
+    would still like to have a keyboard shortcut for quitting. Since we
+    construct a \l QShortcut with \l QKeySequence::Quit, and connect it to
+    \l QApplication::quit(), on most platforms it will be possible to press
+    Control-Q to quit (or whichever standard Quit key is configured on that platform).
+    (On \macos, this is redundant, because every application gets a
+    \uicontrol Quit menu item automatically; but it helps to make the application portable.)
 
     \snippet dialogs/findfiles/window.cpp 2
 
@@ -122,18 +126,16 @@
     We use the directory's path to create a QDir; the QDir class
     provides access to directory structures and their contents.
 
-    \snippet dialogs/findfiles/window.cpp 13
-
-    We recursively create a list of the files (contained in the newl
-    created QDir) that match the specified file name.
+    We use QDirIterator to iterate over the files that match the
+    specified file name and build a QStringList of paths.
 
     Then we search through all the files in the list, using the private
-    \c findFiles() function, eliminating the ones that don't contain
-    the specified text. And finally, we display the results using the
-    private \c showFiles() function.
+    \c findFiles() function, eliminating the ones that don't contain the
+    specified text. We sort them (because QDirIterator did not). And finally,
+    we display the results using the private \c showFiles() function.
 
     If the user didn't specify any text, there is no reason to search
-    through the files, and we display the results immediately.
+    through the files, so we sort and display the results immediately.
 
     \image findfiles_progress_dialog.png Screenshot of the Progress Dialog
 
@@ -196,7 +198,8 @@
     the \c find() slot. In the \c showFiles() function we run through
     the provided list of file names, adding each relative file name to the
     first column in the table widget and retrieving the file's size using
-    QFileInfo for the second column. For later use, we set
+    QFileInfo for the second column. We use \l QLocale::formattedDataSize()
+    to format the file size in a human-readable form. For later use, we set
     the absolute path as a data on the QTableWidget using the
     the role absoluteFileNameRole defined to be Qt::UserRole + 1.
 
diff --git a/examples/widgets/doc/src/graphicsview-simpleanchorlayout.qdoc b/examples/widgets/doc/src/graphicsview-simpleanchorlayout.qdoc
index 866dac442b..fd0427fdc0 100644
--- a/examples/widgets/doc/src/graphicsview-simpleanchorlayout.qdoc
+++ b/examples/widgets/doc/src/graphicsview-simpleanchorlayout.qdoc
@@ -35,4 +35,50 @@
     QGraphicsAnchorLayout class.
 
     \image graphicssimpleanchorlayout-example.png
+
+    The example starts by creating a QGraphicsScene (\c scene), 3 widgets
+    (\c a, \c b, and \c c), and a QGraphicsAnchorlayout (\c layout).
+
+    \quotefromfile graphicsview/simpleanchorlayout/main.cpp
+    \skipto QGraphicsScene
+    \printuntil QGraphicsAnchorLayout
+
+    First it anchors the top left corner of item \c a to the top left
+    corner of \c layout. This can be done in two steps:
+
+    \skipto layout->addAnchor(a
+    \printto adding
+
+    Or in one step:
+
+    \skipuntil [adding a corner anchor]
+    \printline layout->addCornerAnchors(a, Qt::T
+
+    Then the right anchor of \c a is anchored to the left anchor of
+    \c b, and the top of item \c b is anchored to the bottom of \c a.
+
+    \skipuntil [adding anchors]
+    \printto adding anchors
+
+    Place a third widget \c c under widget \c b:
+
+    \skipuntil third widget
+    \printline AnchorBottom
+
+    Items \c b and \c c are anchored to each other horizontally:
+
+    \skipto Qt::Horizontal
+    \printline Qt::Horizontal
+
+    Item c is anchored to the bottom right point of \c layout
+
+    \skipuntil corner of the layout
+    \printline Qt::BottomRightCorner
+
+    Finally, QGraphicsWidget \c w is displayed in QGraphicsView \c view.
+
+    \skipto QGraphicsWidget
+    \printuntil app.exec()
+
+    \sa {Anchor Layout Example}
 */