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

Conflicts: src/corelib/io/io.pri src/corelib/io/qdatastream.cpp src/corelib/io/qdatastream.h src/network/socket/qabstractsocket.cpp src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h src/widgets/styles/qgtkstyle.cpp tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro tests/auto/dbus/qdbusconnection/qdbusconnection.pro tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp Change-Id: I347549a024eb5bfa986699e0a11f96cc55c797a7
author: Liang Qi <liang.qi@theqtcompany.com> 2015-09-25 14:02:04 +0200
committer: Liang Qi <liang.qi@theqtcompany.com> 2015-09-25 14:02:04 +0200
commit: a1ad9a74ebb3c556c5f70f7e03be68b09598ac53 (patch)
tree: 615a96db418219a57a745a5899e39a9ac90744ec /examples/widgets
parent: 6d78b7a0c46ea04f4bb771d960e2f7dff1362341 (diff)
parent: 462f355e4fb16cc7a1838fa2dda0f763eee58c84 (diff)
35 files changed, 1341 insertions, 935 deletions
diff --git a/examples/widgets/desktop/screenshot/main.cpp b/examples/widgets/desktop/screenshot/main.cpp
index 788ebb3532..811562858a 100644
--- a/examples/widgets/desktop/screenshot/main.cpp
+++ b/examples/widgets/desktop/screenshot/main.cpp
@@ -39,13 +39,16 @@
 ****************************************************************************/
 
 #include <QApplication>
+#include <QDesktopWidget>
 
 #include "screenshot.h"
 
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
+
     Screenshot screenshot;
+    screenshot.move(QApplication::desktop()->availableGeometry(&screenshot).topLeft() + QPoint(20, 20));
     screenshot.show();
     return app.exec();
 }
diff --git a/examples/widgets/desktop/screenshot/screenshot.cpp b/examples/widgets/desktop/screenshot/screenshot.cpp
index bfca5a45ae..354fe36369 100644
--- a/examples/widgets/desktop/screenshot/screenshot.cpp
+++ b/examples/widgets/desktop/screenshot/screenshot.cpp
@@ -44,20 +44,48 @@
 
 //! [0]
 Screenshot::Screenshot()
+    :  screenshotLabel(new QLabel(this))
 {
-    screenshotLabel = new QLabel;
     screenshotLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     screenshotLabel->setAlignment(Qt::AlignCenter);
-    screenshotLabel->setMinimumSize(240, 160);
 
-    createOptionsGroupBox();
-    createButtonsLayout();
+    const QRect screenGeometry = QApplication::desktop()->screenGeometry(this);
+    screenshotLabel->setMinimumSize(screenGeometry.width() / 8, screenGeometry.height() / 8);
 
-    mainLayout = new QVBoxLayout;
+    QVBoxLayout *mainLayout = new QVBoxLayout(this);
     mainLayout->addWidget(screenshotLabel);
+
+    QGroupBox *optionsGroupBox = new QGroupBox(tr("Options"), this);
+    delaySpinBox = new QSpinBox(optionsGroupBox);
+    delaySpinBox->setSuffix(tr(" s"));
+    delaySpinBox->setMaximum(60);
+
+    typedef void (QSpinBox::*QSpinBoxIntSignal)(int);
+    connect(delaySpinBox, static_cast<QSpinBoxIntSignal>(&QSpinBox::valueChanged),
+            this, &Screenshot::updateCheckBox);
+
+    hideThisWindowCheckBox = new QCheckBox(tr("Hide This Window"), optionsGroupBox);
+
+    QGridLayout *optionsGroupBoxLayout = new QGridLayout(optionsGroupBox);
+    optionsGroupBoxLayout->addWidget(new QLabel(tr("Screenshot Delay:"), this), 0, 0);
+    optionsGroupBoxLayout->addWidget(delaySpinBox, 0, 1);
+    optionsGroupBoxLayout->addWidget(hideThisWindowCheckBox, 1, 0, 1, 2);
+
     mainLayout->addWidget(optionsGroupBox);
+
+    QHBoxLayout *buttonsLayout = new QHBoxLayout;
+    newScreenshotButton = new QPushButton(tr("New Screenshot"), this);
+    connect(newScreenshotButton, &QPushButton::clicked, this, &Screenshot::newScreenshot);
+    buttonsLayout->addWidget(newScreenshotButton);
+    QPushButton *saveScreenshotButton = new QPushButton(tr("Save Screenshot"), this);
+    connect(saveScreenshotButton, &QPushButton::clicked, this, &Screenshot::saveScreenshot);
+    buttonsLayout->addWidget(saveScreenshotButton);
+    QPushButton *quitScreenshotButton = new QPushButton(tr("Quit"), this);
+    quitScreenshotButton->setShortcut(Qt::CTRL + Qt::Key_Q);
+    connect(quitScreenshotButton, &QPushButton::clicked, this, &QWidget::close);
+    buttonsLayout->addWidget(quitScreenshotButton);
+    buttonsLayout->addStretch();
     mainLayout->addLayout(buttonsLayout);
-    setLayout(mainLayout);
 
     shootScreen();
     delaySpinBox->setValue(5);
@@ -84,44 +112,59 @@ void Screenshot::newScreenshot()
         hide();
     newScreenshotButton->setDisabled(true);
 
-    QTimer::singleShot(delaySpinBox->value() * 1000, this, SLOT(shootScreen()));
+    QTimer::singleShot(delaySpinBox->value() * 1000, this, &Screenshot::shootScreen);
 }
 //! [2]
 
 //! [3]
 void Screenshot::saveScreenshot()
 {
-    QString format = "png";
-    QString initialPath = QDir::currentPath() + tr("/untitled.") + format;
-
-    QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), initialPath,
-                                                    tr("%1 Files (*.%2);;All Files (*)")
-                                                    .arg(format.toUpper())
-                                                    .arg(format));
-    if (!fileName.isEmpty())
-        originalPixmap.save(fileName, format.toLatin1().constData());
+    const QString format = "png";
+    QString initialPath = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
+    if (initialPath.isEmpty())
+        initialPath = QDir::currentPath();
+    initialPath += tr("/untitled.") + format;
+
+    QFileDialog fileDialog(this, tr("Save As"), initialPath);
+    fileDialog.setAcceptMode(QFileDialog::AcceptSave);
+    fileDialog.setFileMode(QFileDialog::AnyFile);
+    fileDialog.setDirectory(initialPath);
+    QStringList mimeTypes;
+    foreach (const QByteArray &bf, QImageWriter::supportedMimeTypes())
+        mimeTypes.append(QLatin1String(bf));
+    fileDialog.setMimeTypeFilters(mimeTypes);
+    fileDialog.selectMimeTypeFilter("image/" + format);
+    fileDialog.setDefaultSuffix(format);
+    if (fileDialog.exec() != QDialog::Accepted)
+        return;
+    const QString fileName = fileDialog.selectedFiles().first();
+    if (!originalPixmap.save(fileName)) {
+        QMessageBox::warning(this, tr("Save Error"), tr("The image could not be saved to \"%1\".")
+                             .arg(QDir::toNativeSeparators(fileName)));
+    }
 }
 //! [3]
 
 //! [4]
 void Screenshot::shootScreen()
 {
-    if (delaySpinBox->value() != 0)
-        qApp->beep();
-//! [4]
-    originalPixmap = QPixmap(); // clear image for low memory situations
-                                // on embedded devices.
-//! [5]
     QScreen *screen = QGuiApplication::primaryScreen();
-    if (screen)
-        originalPixmap = screen->grabWindow(0);
+    if (const QWindow *window = windowHandle())
+        screen = window->screen();
+    if (!screen)
+        return;
+
+    if (delaySpinBox->value() != 0)
+        QApplication::beep();
+
+    originalPixmap = screen->grabWindow(0);
     updateScreenshotLabel();
 
     newScreenshotButton->setDisabled(false);
     if (hideThisWindowCheckBox->isChecked())
         show();
 }
-//! [5]
+//! [4]
 
 //! [6]
 void Screenshot::updateCheckBox()
@@ -135,52 +178,6 @@ void Screenshot::updateCheckBox()
 }
 //! [6]
 
-//! [7]
-void Screenshot::createOptionsGroupBox()
-{
-    optionsGroupBox = new QGroupBox(tr("Options"));
-
-    delaySpinBox = new QSpinBox;
-    delaySpinBox->setSuffix(tr(" s"));
-    delaySpinBox->setMaximum(60);
-    connect(delaySpinBox, SIGNAL(valueChanged(int)), this, SLOT(updateCheckBox()));
-
-    delaySpinBoxLabel = new QLabel(tr("Screenshot Delay:"));
-
-    hideThisWindowCheckBox = new QCheckBox(tr("Hide This Window"));
-
-    optionsGroupBoxLayout = new QGridLayout;
-    optionsGroupBoxLayout->addWidget(delaySpinBoxLabel, 0, 0);
-    optionsGroupBoxLayout->addWidget(delaySpinBox, 0, 1);
-    optionsGroupBoxLayout->addWidget(hideThisWindowCheckBox, 1, 0, 1, 2);
-    optionsGroupBox->setLayout(optionsGroupBoxLayout);
-}
-//! [7]
-
-//! [8]
-void Screenshot::createButtonsLayout()
-{
-    newScreenshotButton = createButton(tr("New Screenshot"), this, SLOT(newScreenshot()));
-    saveScreenshotButton = createButton(tr("Save Screenshot"), this, SLOT(saveScreenshot()));
-    quitScreenshotButton = createButton(tr("Quit"), this, SLOT(close()));
-
-    buttonsLayout = new QHBoxLayout;
-    buttonsLayout->addStretch();
-    buttonsLayout->addWidget(newScreenshotButton);
-    buttonsLayout->addWidget(saveScreenshotButton);
-    buttonsLayout->addWidget(quitScreenshotButton);
-}
-//! [8]
-
-//! [9]
-QPushButton *Screenshot::createButton(const QString &text, QWidget *receiver,
-                                      const char *member)
-{
-    QPushButton *button = new QPushButton(text);
-    button->connect(button, SIGNAL(clicked()), receiver, member);
-    return button;
-}
-//! [9]
 
 //! [10]
 void Screenshot::updateScreenshotLabel()
diff --git a/examples/widgets/desktop/screenshot/screenshot.h b/examples/widgets/desktop/screenshot/screenshot.h
index 352806cdba..f0e737e4c7 100644
--- a/examples/widgets/desktop/screenshot/screenshot.h
+++ b/examples/widgets/desktop/screenshot/screenshot.h
@@ -73,25 +73,14 @@ private slots:
     void updateCheckBox();
 
 private:
-    void createOptionsGroupBox();
-    void createButtonsLayout();
-    QPushButton *createButton(const QString &text, QWidget *receiver, const char *member);
     void updateScreenshotLabel();
 
     QPixmap originalPixmap;
 
     QLabel *screenshotLabel;
-    QGroupBox *optionsGroupBox;
     QSpinBox *delaySpinBox;
-    QLabel *delaySpinBoxLabel;
     QCheckBox *hideThisWindowCheckBox;
     QPushButton *newScreenshotButton;
-    QPushButton *saveScreenshotButton;
-    QPushButton *quitScreenshotButton;
-
-    QVBoxLayout *mainLayout;
-    QGridLayout *optionsGroupBoxLayout;
-    QHBoxLayout *buttonsLayout;
 };
 //! [0]
 
diff --git a/examples/widgets/desktop/systray/window.cpp b/examples/widgets/desktop/systray/window.cpp
index b212dc440d..931e443de7 100644
--- a/examples/widgets/desktop/systray/window.cpp
+++ b/examples/widgets/desktop/systray/window.cpp
@@ -42,11 +42,11 @@
 
 #ifndef QT_NO_SYSTEMTRAYICON
 
-#include <QtGui>
-
 #include <QAction>
 #include <QCheckBox>
 #include <QComboBox>
+#include <QCoreApplication>
+#include <QCloseEvent>
 #include <QGroupBox>
 #include <QLabel>
 #include <QLineEdit>
@@ -68,12 +68,13 @@ Window::Window()
     createActions();
     createTrayIcon();
 
-    connect(showMessageButton, SIGNAL(clicked()), this, SLOT(showMessage()));
-    connect(showIconCheckBox, SIGNAL(toggled(bool)), trayIcon, SLOT(setVisible(bool)));
-    connect(iconComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(setIcon(int)));
-    connect(trayIcon, SIGNAL(messageClicked()), this, SLOT(messageClicked()));
-    connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
-            this, SLOT(iconActivated(QSystemTrayIcon::ActivationReason)));
+    connect(showMessageButton, &QAbstractButton::clicked, this, &Window::showMessage);
+    connect(showIconCheckBox, &QAbstractButton::toggled, trayIcon, &QSystemTrayIcon::setVisible);
+    typedef void (QComboBox::*QComboIntSignal)(int);
+    connect(iconComboBox, static_cast<QComboIntSignal>(&QComboBox::currentIndexChanged),
+            this, &Window::setIcon);
+    connect(trayIcon, &QSystemTrayIcon::messageClicked, this, &Window::messageClicked);
+    connect(trayIcon, &QSystemTrayIcon::activated, this, &Window::iconActivated);
 
     QVBoxLayout *mainLayout = new QVBoxLayout;
     mainLayout->addWidget(iconGroupBox);
@@ -245,16 +246,16 @@ void Window::createMessageGroupBox()
 void Window::createActions()
 {
     minimizeAction = new QAction(tr("Mi&nimize"), this);
-    connect(minimizeAction, SIGNAL(triggered()), this, SLOT(hide()));
+    connect(minimizeAction, &QAction::triggered, this, &QWidget::hide);
 
     maximizeAction = new QAction(tr("Ma&ximize"), this);
-    connect(maximizeAction, SIGNAL(triggered()), this, SLOT(showMaximized()));
+    connect(maximizeAction, &QAction::triggered, this, &QWidget::showMaximized);
 
     restoreAction = new QAction(tr("&Restore"), this);
-    connect(restoreAction, SIGNAL(triggered()), this, SLOT(showNormal()));
+    connect(restoreAction, &QAction::triggered, this, &QWidget::showNormal);
 
     quitAction = new QAction(tr("&Quit"), this);
-    connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
+    connect(quitAction, &QAction::triggered, qApp, &QCoreApplication::quit);
 }
 
 void Window::createTrayIcon()
diff --git a/examples/widgets/dialogs/standarddialogs/dialog.cpp b/examples/widgets/dialogs/standarddialogs/dialog.cpp
index 560ca77f31..b4232c36f6 100644
--- a/examples/widgets/dialogs/standarddialogs/dialog.cpp
+++ b/examples/widgets/dialogs/standarddialogs/dialog.cpp
@@ -242,6 +242,10 @@ Dialog::Dialog(QWidget *parent)
     layout->addWidget(fontLabel, 0, 1);
     fontDialogOptionsWidget = new DialogOptionsWidget;
     fontDialogOptionsWidget->addCheckBox(doNotUseNativeDialog, QFontDialog::DontUseNativeDialog);
+    fontDialogOptionsWidget->addCheckBox(tr("Show scalable fonts"), QFontDialog::ScalableFonts);
+    fontDialogOptionsWidget->addCheckBox(tr("Show non scalable fonts"), QFontDialog::NonScalableFonts);
+    fontDialogOptionsWidget->addCheckBox(tr("Show monospaced fonts"), QFontDialog::MonospacedFonts);
+    fontDialogOptionsWidget->addCheckBox(tr("Show proportional fonts"), QFontDialog::ProportionalFonts);
     fontDialogOptionsWidget->addCheckBox(tr("No buttons") , QFontDialog::NoButtons);
     layout->addItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding), 1, 0);
     layout->addWidget(fontDialogOptionsWidget, 2, 0, 1 ,2);
@@ -266,6 +270,7 @@ Dialog::Dialog(QWidget *parent)
     fileDialogOptionsWidget->addCheckBox(tr("Do not use sheet"), QFileDialog::DontUseSheet);
     fileDialogOptionsWidget->addCheckBox(tr("Readonly"), QFileDialog::ReadOnly);
     fileDialogOptionsWidget->addCheckBox(tr("Hide name filter details"), QFileDialog::HideNameFilterDetails);
+    fileDialogOptionsWidget->addCheckBox(tr("Do not use custom directory icons (Windows)"), QFileDialog::DontUseCustomDirectoryIcons);
     layout->addItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding), 4, 0);
     layout->addWidget(fileDialogOptionsWidget, 5, 0, 1 ,2);
     toolbox->addItem(page, tr("File Dialogs"));
diff --git a/examples/widgets/dialogs/standarddialogs/main.cpp b/examples/widgets/dialogs/standarddialogs/main.cpp
index eafd2271df..a13e37905c 100644
--- a/examples/widgets/dialogs/standarddialogs/main.cpp
+++ b/examples/widgets/dialogs/standarddialogs/main.cpp
@@ -39,6 +39,7 @@
 ****************************************************************************/
 
 #include <QApplication>
+#include <QDesktopWidget>
 #include <QTranslator>
 #include <QLocale>
 #include <QLibraryInfo>
@@ -58,6 +59,10 @@ int main(int argc, char *argv[])
 #endif
 
     Dialog dialog;
+    const QRect availableGeometry = QApplication::desktop()->availableGeometry(&dialog);
+    dialog.resize(availableGeometry.width() / 3, availableGeometry.height() * 2 / 3);
+    dialog.move((availableGeometry.width() - dialog.width()) / 2,
+                (availableGeometry.height() - dialog.height()) / 2);
     dialog.show();
 
     return app.exec();
diff --git a/examples/widgets/doc/images/systemtray-editor.png b/examples/widgets/doc/images/systemtray-editor.png
new file mode 100644
index 0000000000..fb15dea8cb
--- /dev/null
+++ b/examples/widgets/doc/images/systemtray-editor.png
diff --git a/examples/widgets/doc/images/systemtray-example.png b/examples/widgets/doc/images/systemtray-example.png
new file mode 100644
index 0000000000..98b5c8133e
--- /dev/null
+++ b/examples/widgets/doc/images/systemtray-example.png
diff --git a/examples/widgets/doc/src/icons.qdoc b/examples/widgets/doc/src/icons.qdoc
index 5a902e1d98..16cdb5abd0 100644
--- a/examples/widgets/doc/src/icons.qdoc
+++ b/examples/widgets/doc/src/icons.qdoc
@@ -254,6 +254,21 @@
     generated pixmaps corresponding to an icon's possible states and
     modes at a given size.
 
+    \snippet widgets/icons/iconpreviewarea.cpp 42
+
+    We would like the table columns to  be in the order QIcon::Normal,
+    QIcon::Active, QIcon::Disabled, QIcon::Selected and the rows in the order
+    QIcon::Off, QIcon::On, which does not match the enumeration. The above code
+    provides arrays allowing to map from enumeration value to row/column
+    (by using QVector::indexOf()) and back by using the array index and lists
+    of the matching strings. Qt's containers can be easily populated by
+    using C++ 11 initializer lists. If the compiler does not provide that feature,
+    a pattern like
+
+    \snippet widgets/icons/iconpreviewarea.cpp 43
+
+    can be used.
+
     We need two public functions to set the current icon and the
     icon's size. In addition the class has three private functions: We
     use the \c createHeaderLabel() and \c createPixmapLabel()
@@ -326,7 +341,12 @@
 
     For each mode, and for each state, we retrieve a pixmap using the
     QIcon::pixmap() function, which generates a pixmap corresponding
-    to the given state, mode and size.
+    to the given state, mode and size. We pass the QWindows instance
+    obtained by calling QWidget::windowHandle() on the top level
+    widget (QWidget::nativeParentWidget()) in order to retrieve
+    the pixmap that matches best.
+    We format a tooltip displaying size, actual size and device pixel
+    ratio.
 
     \section2 MainWindow Class Definition
 
@@ -347,8 +367,14 @@
     \li The \c changeSize() slot changes the size of the preview area's icon.
     \li The \c changeIcon() slot updates the set of pixmaps available to the
        icon displayed in the preview area.
-    \li The \c addImage() slot allows the user to load a new image into the
-       application.
+    \li The \c addSampleImages() slot allows the user to load a new image
+        from the samples provided  into the application.
+    \li The \c addOtherImages() slot allows the user to load a new image from
+        the directory obtained by calling
+        QStandardPaths::standardLocations(QStandardPaths::PicturesLocation).
+    \li The \c screenChanged() updates the display in the \uicontrol{High DPI}
+        group box to correctly display the parameters of the current screen
+        the window is located on.
     \endlist
 
     In addition we declare several private functions to simplify the
@@ -362,8 +388,7 @@
     widget and its child widgets, and put them in a grid layout. Then
     we create the menus with their associated entries and actions.
 
-    Before we resize the application window to a suitable size, we set
-    the window title and determine the current style for the
+    We set the window title and determine the current style for the
     application. We also enable the icon size spin box by clicking the
     associated radio button, making the current value of the spin box
     the icon's initial size.
@@ -421,21 +446,27 @@
     The \c changeSize() slot sets the size for the preview area's
     icon.
 
-    To determine the new size we first check if the spin box is
+    It is invoked by the QButtonGroup whose members are radio buttons for
+    controlling the icon size.  In \c createIconSizeGroupBox(), each button is
+    assigned a QStyle::PixelMetric value as an id, which is passed as a
+    parameter to the slot.
+
+    The special value \c OtherSize indicates that the spin box is
     enabled. If it is, we extract the extent of the new size from the
-    box. If it's not, we search through the predefined size options,
-    extract the QStyle::PixelMetric and use the QStyle::pixelMetric()
-    function to determine the extent. Then we create a QSize object
-    based on the extent, and use that object to set the size of the
-    preview area's icon.
+    box. If it's not, we query the style for the metric. Then we create
+    a QSize object based on the extent, and use that object to set the
+    size of the preview area's icon.
 
     \snippet widgets/icons/mainwindow.cpp 12
 
-    The first thing we do when the \c addImage() slot is called, is to
-    show a file dialog to the user. The easiest way to create a file
-    dialog is to use QFileDialog's static functions. Here we use the
-    \l {QFileDialog::getOpenFileNames()}{getOpenFileNames()} function
-    that will return one or more existing files selected by the user.
+    The function \c addImages() is called by the slot addSampleImages()
+    passing the samples directory, or by the slot addOtherImages()
+    passing the directory obtained by querying
+    QStandardPaths::standardLocations().
+
+    The first thing we do is to show a file dialog to the user.
+    We initialize it to show the filters returned by
+    QImageReader::supportedMimeTypes().
 
     For each of the files the file dialog returns, we add a row to the
     table widget. The table widget is listing the images the user has
@@ -446,9 +477,13 @@
 
     We retrieve the image name using the QFileInfo::baseName()
     function that returns the base name of the file without the path,
-    and create the first table widget item in the row. Then we add the
-    file's complete name to the item's data. Since an item can hold
-    several information pieces, we need to assign the file name a role
+    and create the first table widget item in the row.
+    We check if a high resolution version of the image exists (identified by
+    the suffix \c @2x on the base name) and display that along with the size
+    in the tooltip.
+
+    We add the file's complete name to the item's data. Since an item can
+    hold several information pieces, we need to assign the file name a role
     that will distinguish it from other data. This role can be Qt::UserRole
     or any value above it.
 
@@ -465,7 +500,7 @@
     contains "_act", "_dis", or "_sel", the modes are changed to
     Active, Disabled, or Selected. And if the file name contains
     "_on", the state is changed to On. The sample files in the
-    example's \c images subdirectory respect this naming convension.
+    example's \c images subdirectory respect this naming convention.
 
     \snippet widgets/icons/mainwindow.cpp 18
     \snippet widgets/icons/mainwindow.cpp 19
@@ -482,7 +517,6 @@
     make sure that the new image's check box is enabled.
 
     \snippet widgets/icons/mainwindow.cpp 6
-    \snippet widgets/icons/mainwindow.cpp 7
 
     The \c changeIcon() slot is called when the user alters the set
     of images listed in the QTableWidget, to update the QIcon object
@@ -562,7 +596,7 @@
     \snippet widgets/icons/mainwindow.cpp 25
 
     At the end, we connect the QTableWidget::itemChanged() signal to
-    the \c changeIcon() slot to ensuret that the preview area is in
+    the \c changeIcon() slot to ensure that the preview area is in
     sync with the image table.
 
     \image icons_size_groupbox.png Screenshot of the icon size group box
@@ -574,7 +608,14 @@
     \snippet widgets/icons/mainwindow.cpp 26
 
     First we create a group box that will contain all the widgets;
-    then we create the radio buttons and the spin box.
+    then we create the radio buttons and the spin box. We add the
+    radio buttons to an instance of QButtonGroup, using the value
+    of the QStyle::PixelMetric they represent as an integer id.
+
+    \snippet widgets/icons/mainwindow.cpp 40
+
+    We introduce an enumeration constant \c OtherSize to represent
+    a custom size.
 
     The spin box is not a regular QSpinBox but an \c IconSizeSpinBox.
     The \c IconSizeSpinBox class inherits QSpinBox and reimplements
@@ -602,19 +643,16 @@
     In particular we create the \c styleActionGroup based on the
     currently available GUI styles using
     QStyleFactory. QStyleFactory::keys() returns a list of valid keys,
-    typically including "windows", "cleanlooks" and
-    "plastique". Depending on the platform, "windowsxp", "windowsvista", "gtk" and
-    "macintosh" may be available.
+    typically including "windows" and "fusion". Depending on the platform,
+    "windowsvista" and "macintosh" may be available.
 
     We create one action for each key, and adds the action to the
     action group. Also, for each action, we call QAction::setData()
     with the style name. We will retrieve it later using
     QAction::data().
 
-    \snippet widgets/icons/mainwindow.cpp 29
-
-    In the \c createMenu() function, we add the previously created
-    actions to the \uicontrol File, \uicontrol View and \uicontrol Help menus.
+    As we go along, we create the \uicontrol File, \uicontrol View and
+    \uicontrol Help menus and add the actions to them.
 
     The QMenu class provides a menu widget for use in menu bars,
     context menus, and other popup menus. We put each menu in the
@@ -656,6 +694,13 @@
     Q_ASSERT() macro to make sure that QStyleFactory::create()
     returned a valid pointer.
 
+    \snippet widgets/icons/mainwindow.cpp 44
+
+    We overload the show() function to set up the updating of the
+    current screen in \c screenChanged(). After calling QWidget::show(),
+    the QWindow associated with the QWidget is created and we can
+    connect to its QWindow::screenChanged() signal.
+
     \section2 IconSizeSpinBox Class Definition
 
     \snippet widgets/icons/iconsizespinbox.h 0
@@ -690,7 +735,7 @@
     reimplement the \c valueFromText() function to interpret the
     parameter text and return the associated int value.
 
-    We parse the text using a regular expression (a QRegExp). We
+    We parse the text using a regular expression (a QRegularExpression). We
     define an expression that matches one or several digits,
     optionally followed by whitespace, an "x" or the times symbol,
     whitespace and one or several digits again.
@@ -748,7 +793,7 @@
     index for editing. The parent widget and style option are used to
     control the appearance of the editor widget.
 
-    Our reimplementation create and populate a combobox instead of
+    Our reimplementation creates and populates a combobox instead of
     the default line edit. The contents of the combobox depends on
     the column in the table for which the editor is requested. Column
     1 contains the QIcon modes, whereas column 2 contains the QIcon
@@ -786,4 +831,12 @@
     triggered the slot. This signal must be emitted when the editor
     widget has completed editing the data, and wants to write it back
     into the model.
+
+    \section2 The Implementation of the Function main()
+
+    \snippet widgets/icons/main.cpp 45
+
+    We use QCommandLineParser to handle any command line options or parameters
+    passed to the application. Then, we resize the main window according
+    to the available screen geometry and show it.
 */
diff --git a/examples/widgets/doc/src/imageviewer.qdoc b/examples/widgets/doc/src/imageviewer.qdoc
index 91ae56b5d7..4457da9d6f 100644
--- a/examples/widgets/doc/src/imageviewer.qdoc
+++ b/examples/widgets/doc/src/imageviewer.qdoc
@@ -287,7 +287,8 @@
     \snippet widgets/imageviewer/imageviewer.cpp 18
 
     In the private \c createAction() function, we create the
-    actions providing the application features.
+    actions providing the application features and populate
+    a menu with them.
 
     We assign a short-cut key to each action and connect them to the
     appropriate slots. We only enable the \c openAct and \c exitAct at
@@ -295,16 +296,10 @@
     been loaded into the application. In addition we make the \c
     fitToWindowAct \l {QAction::checkable}{checkable}.
 
-    \snippet widgets/imageviewer/imageviewer.cpp 19
-    \snippet widgets/imageviewer/imageviewer.cpp 20
-
-    In the private \c createMenu() function, we add the previously
-    created actions to the \uicontrol File, \uicontrol View and \uicontrol Help menus.
-
     The QMenu class provides a menu widget for use in menu bars,
     context menus, and other popup menus. The QMenuBar class provides
     a horizontal menu bar that consists of a list of pull-down menu
-    items. So at the end we put the menus in the \c {ImageViewer}'s
+    items. So we put the menus in the \c {ImageViewer}'s
     menu bar which we retrieve with the QMainWindow::menuBar()
     function.
 
diff --git a/examples/widgets/doc/src/screenshot.qdoc b/examples/widgets/doc/src/screenshot.qdoc
index 32c4df9ec2..b376b6ce0e 100644
--- a/examples/widgets/doc/src/screenshot.qdoc
+++ b/examples/widgets/doc/src/screenshot.qdoc
@@ -33,7 +33,7 @@
     desktop.
 
     \brief The Screenshot example shows how to take a screenshot of the
-    desktop using QApplication and QDesktopWidget. It also shows how
+    desktop using QScreen. It also shows how
     to use QTimer to provide a single-shot timer, and how to
     reimplement the QWidget::resizeEvent() event handler to make sure
     that an application resizes smoothly and without data loss.
@@ -73,12 +73,9 @@
        \uicontrol {Hide This Window} option.
     \endlist
 
-    We also declare some private functions: We use the \c
-    createOptionsGroupBox(), \c createButtonsLayout() and \c
-    createButton() functions when we construct the widget. And we call
-    the private \c updateScreenshotLabel() function whenever a new
-    screenshot is taken or when a resize event changes the size of the
-    screenshot preview label.
+    We also declare the private function \c updateScreenshotLabel() which
+    is called whenever a new screenshot is taken or when a resize event
+    changes the size of the screenshot preview label.
 
     In addition we need to store the screenshot's original pixmap. The
     reason is that when we display the preview of the screenshot, we
@@ -100,11 +97,18 @@
     aligned in the center of the \c Screenshot widget, and set its
     minimum size.
 
+    Next, we create a group box that will contain all of the options'
+    widgets. Then we create a QSpinBox and a QLabel for the \uicontrol
+    {Screenshot Delay} option, and connect the spinbox to the \c
+    updateCheckBox() slot. Finally, we create a QCheckBox for the \uicontrol
+    {Hide This Window} option, add all the options' widgets to a
+    QGridLayout installed on the group box.
+
     We create the applications's buttons and the group box containing
     the application's options, and put it all into a main
     layout. Finally we take the initial screenshot, and set the initial
     delay and the window title, before we resize the widget to a
-    suitable size.
+    suitable size depending on the screen geometry.
 
     \snippet desktop/screenshot/screenshot.cpp 1
 
@@ -151,34 +155,37 @@
     QFileDialog enables a user to traverse the file system in order to
     select one or many files or a directory. The easiest way to create
     a QFileDialog is to use the convenience static
-    functions.
+    functions. Here, we instantiate the dialog on the stack in order
+    to be able to set up the supported mime types of QImageWriter,
+    allowing the user to save in a variety of formats.
 
     We define the default file format to be png, and we make the file
-    dialog's initial path the path the application is run from. We
-    create the file dialog using the static
-    QFileDialog::getSaveFileName() function which returns a file name
-    selected by the user. The file does not have to exist. If the file
+    dialog's initial path the location of pictures as obtained from
+    QStandardPaths, defaulting to the path the application is run from.
+
+    We run the dialog by invoking QDialog::exec() and return if the
+    user canceled the dialog. If the dialog has been accepted, we
+    obtain a file name by calling QFileDialog::selectedFiles().
+    The file does not have to exist. If the file
     name is valid, we use the QPixmap::save() function to save the
     screenshot's original pixmap in that file.
 
     \snippet desktop/screenshot/screenshot.cpp 4
 
-    The \c shootScreen() slot is called to take the screenshot. If the
-    user has chosen to delay the screenshot, we make the application
-    beep when the screenshot is taken using the static
-    QApplication::beep() function.
-
-    The QApplication class manages the GUI application's control flow
-    and main settings. It contains the main event loop, where all
-    events from the window system and other sources are processed and
-    dispatched.
+    The \c shootScreen() slot is called to take the screenshot.
 
-    \snippet desktop/screenshot/screenshot.cpp 5
+    First, we find the instance of QScreen the window is located
+    by retrieving the QWindow and its QScreen, defaulting
+    to the primary screen. If no screen can be found, we return.
+    Although this is unlikely to happen, applications should check
+    for null pointers since there might be situations in which no
+    screen is connected.
 
-    Using the static function QApplication::primaryScreen(), we
-    obtain the QScreen object for the application's main screen.
+    If the user has chosen to delay the screenshot, we make the application
+    beep when the screenshot is taken using the static
+    QApplication::beep() function.
 
-    We take the screenshot using the QScreen::grabWindow()
+    We then take the screenshot using the QScreen::grabWindow()
     function. The function grabs the contents of the window passed as
     an argument, makes a pixmap out of it and returns that pixmap.
     The window id can be obtained with QWidget::winId() or QWindow::winId().
@@ -200,37 +207,6 @@
     The \c updateCheckBox() slot is called whenever the user changes
     the delay using the \uicontrol {Screenshot Delay} option.
 
-    \snippet desktop/screenshot/screenshot.cpp 7
-
-    The private \c createOptionsGroupBox() function is called from the
-    constructor.
-
-    First we create a group box that will contain all of the options'
-    widgets. Then we create a QSpinBox and a QLabel for the \uicontrol
-    {Screenshot Delay} option, and connect the spinbox to the \c
-    updateCheckBox() slot. Finally, we create a QCheckBox for the \uicontrol
-    {Hide This Window} option, add all the options' widgets to a
-    QGridLayout and install the layout on the group box.
-
-    Note that we don't have to specify any parents for the widgets
-    when we create them. The reason is that when we add a widget to a
-    layout and install the layout on another widget, the layout's
-    widgets are automatically reparented to the widget the layout is
-    installed on.
-
-    \snippet desktop/screenshot/screenshot.cpp 8
-
-    The private \c createButtonsLayout() function is called from the
-    constructor. We create the application's buttons using the private
-    \c createButton() function, and add them to a QHBoxLayout.
-
-    \snippet desktop/screenshot/screenshot.cpp 9
-
-    The private \c createButton() function is called from the \c
-    createButtonsLayout() function. It simply creates a QPushButton
-    with the provided text, connects it to the provided receiver and
-    slot, and returns a pointer to the button.
-
     \snippet desktop/screenshot/screenshot.cpp 10
 
     The private \c updateScreenshotLabel() function is called whenever
diff --git a/examples/widgets/doc/src/systray.qdoc b/examples/widgets/doc/src/systray.qdoc
new file mode 100644
index 0000000000..b05f999dfa
--- /dev/null
+++ b/examples/widgets/doc/src/systray.qdoc
@@ -0,0 +1,179 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://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: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example desktop/systray
+    \title System Tray Icon Example
+    \ingroup examples-widgets
+    \brief The System Tray Icon example shows how to add an icon with a menu
+    and popup messages to a desktop environment's system tray.
+
+    \image systemtray-example.png Screenshot of the System Tray Icon.
+
+    Modern operating systems usually provide a special area on the
+    desktop, called the system tray or notification area, where
+    long-running applications can display icons and short messages.
+
+    This example consists of one single class, \c Window, providing
+    the main application window (i.e., an editor for the system tray
+    icon) and the associated icon.
+
+    \image systemtray-editor.png
+
+    The editor allows the user to choose the preferred icon as well as
+    set the balloon message's type and duration. The user can also
+    edit the message's title and body. Finally, the editor provides a
+    checkbox controlling whether the icon is actually shown in the
+    system tray, or not.
+
+    \section1 Window Class Definition
+
+    The \c Window class inherits QWidget:
+
+    \snippet desktop/systray/window.h 0
+
+    We implement several private slots to respond to user
+    interaction. The other private functions are only convenience
+    functions provided to simplify the constructor.
+
+    The tray icon is an instance of the QSystemTrayIcon class. To
+    check whether a system tray is present on the user's desktop, call
+    the static QSystemTrayIcon::isSystemTrayAvailable()
+    function. Associated with the icon, we provide a menu containing
+    the typical \uicontrol minimize, \uicontrol maximize, \uicontrol restore and
+    \uicontrol quit actions. We reimplement the QWidget::setVisible() function
+    to update the tray icon's menu whenever the editor's appearance
+    changes, e.g., when maximizing or minimizing the main application
+    window.
+
+    Finally, we reimplement QWidget's \l {QWidget::}{closeEvent()}
+    function to be able to inform the user (when closing the editor
+    window) that the program will keep running in the system tray
+    until the user chooses the \uicontrol Quit entry in the icon's context
+    menu.
+
+    \section1 Window Class Implementation
+
+    When constructing the editor widget, we first create the various
+    editor elements before we create the actual system tray icon:
+
+    \snippet desktop/systray/window.cpp 0
+
+    We ensure that the application responds to user input by
+    connecting most of the editor's input widgets (including the
+    system tray icon) to the application's private slots. But note the
+    visibility checkbox; its \l {QCheckBox::}{toggled()} signal is
+    connected to the \e {icon}'s \l {QSystemTrayIcon::}{setVisible()}
+    function instead.
+
+    \snippet desktop/systray/window.cpp 3
+
+    The \c setIcon() slot is triggered whenever the current index in
+    the icon combobox changes, i.e., whenever the user chooses another
+    icon in the editor. Note that it is also called when the user
+    activates the tray icon with the left mouse button, triggering the
+    icon's \l {QSystemTrayIcon::}{activated()} signal. We will come
+    back to this signal shortly.
+
+    The QSystemTrayIcon::setIcon() function sets the \l
+    {QSystemTrayIcon::}{icon} property that holds the actual system
+    tray icon. On Windows, the system tray icon size is 16x16; on X11,
+    the preferred size is 22x22. The icon will be scaled to the
+    appropriate size as necessary.
+
+    Note that on X11, due to a limitation in the system tray
+    specification, mouse clicks on transparent areas in the icon are
+    propagated to the system tray. If this behavior is unacceptable,
+    we suggest using an icon with no transparency.
+
+    \snippet desktop/systray/window.cpp 4
+
+    Whenever the user activates the system tray icon, it emits its \l
+    {QSystemTrayIcon::}{activated()} signal passing the triggering
+    reason as parameter. QSystemTrayIcon provides the \l
+    {QSystemTrayIcon::}{ActivationReason} enum to describe how the
+    icon was activated.
+
+    In the constructor, we connected our icon's \l
+    {QSystemTrayIcon::}{activated()} signal to our custom \c
+    iconActivated() slot: If the user has clicked the icon using the
+    left mouse button, this function changes the icon image by
+    incrementing the icon combobox's current index, triggering the \c
+    setIcon() slot as mentioned above. If the user activates the icon
+    using the middle mouse button, it calls the custom \c
+    showMessage() slot:
+
+    \snippet desktop/systray/window.cpp 5
+
+    When the \e showMessage() slot is triggered, we first retrieve the
+    message icon depending on the currently chosen message type. The
+    QSystemTrayIcon::MessageIcon enum describes the icon that is shown
+    when a balloon message is displayed. Then we call
+    QSystemTrayIcon's \l {QSystemTrayIcon::}{showMessage()} function
+    to show the message with the title, body, and icon for the time
+    specified in milliseconds.
+
+    QSystemTrayIcon also has the corresponding, \l {QSystemTrayIcon::}
+    {messageClicked()} signal, which is emitted when the user clicks a
+    message displayed by \l {QSystemTrayIcon::}{showMessage()}.
+
+    \snippet desktop/systray/window.cpp 6
+
+    In the constructor, we connected the \l
+    {QSystemTrayIcon::}{messageClicked()} signal to our custom \c
+    messageClicked() slot that simply displays a message using the
+    QMessageBox class.
+
+    QMessageBox provides a modal dialog with a short message, an icon,
+    and buttons laid out depending on the current style. It supports
+    four severity levels: "Question", "Information", "Warning" and
+    "Critical". The easiest way to pop up a message box in Qt is to
+    call one of the associated static functions, e.g.,
+    QMessageBox::information().
+
+    As we mentioned earlier, we reimplement a couple of QWidget's
+    virtual functions:
+
+    \snippet desktop/systray/window.cpp 1
+
+    Our reimplementation of the QWidget::setVisible() function updates
+    the tray icon's menu whenever the editor's appearance changes,
+    e.g., when maximizing or minimizing the main application window,
+    before calling the base class implementation.
+
+    \snippet desktop/systray/window.cpp 2
+
+    We have reimplemented the QWidget::closeEvent() event handler to
+    receive widget close events, showing the above message to the
+    users when they are closing the editor window.
+
+    In addition to the functions and slots discussed above, we have
+    also implemented several convenience functions to simplify the
+    constructor: \c createIconGroupBox(), \c createMessageGroupBox(),
+    \c createActions() and \c createTrayIcon(). See the \l
+    {desktop/systray/window.cpp}{window.cpp} file for details.
+*/
diff --git a/examples/widgets/doc/src/tetrix.qdoc b/examples/widgets/doc/src/tetrix.qdoc
index f74d3c14d5..6050fe2356 100644
--- a/examples/widgets/doc/src/tetrix.qdoc
+++ b/examples/widgets/doc/src/tetrix.qdoc
@@ -108,7 +108,7 @@
 
     We connect \l{QAbstractButton::}{clicked()} signals from the \uicontrol{Start}
     and \uicontrol{Pause} buttons to the board, and from the \uicontrol{Quit} button to the
-    application's \l{QApplication::}{quit()} slot.
+    application's \l{QCoreApplication::quit()} slot.
 
     \snippet widgets/tetrix/tetrixwindow.cpp 4
     \snippet widgets/tetrix/tetrixwindow.cpp 5
diff --git a/examples/widgets/richtext/textedit/main.cpp b/examples/widgets/richtext/textedit/main.cpp
index 4dda7e6c75..1de6d994e6 100644
--- a/examples/widgets/richtext/textedit/main.cpp
+++ b/examples/widgets/richtext/textedit/main.cpp
@@ -32,15 +32,37 @@
 ****************************************************************************/
 
 #include "textedit.h"
+
 #include <QApplication>
+#include <QDesktopWidget>
+#include <QCommandLineParser>
+#include <QCommandLineOption>
 
 int main(int argc, char *argv[])
 {
     Q_INIT_RESOURCE(textedit);
 
     QApplication a(argc, argv);
+    QCoreApplication::setOrganizationName("QtProject");
+    QCoreApplication::setApplicationName("Rich Text");
+    QCoreApplication::setApplicationVersion(QT_VERSION_STR);
+    QCommandLineParser parser;
+    parser.setApplicationDescription(QCoreApplication::applicationName());
+    parser.addHelpOption();
+    parser.addVersionOption();
+    parser.addPositionalArgument("file", "The file to open.");
+    parser.process(a);
+
     TextEdit mw;
-    mw.resize(700, 800);
+
+    const QRect availableGeometry = QApplication::desktop()->availableGeometry(&mw);
+    mw.resize(availableGeometry.width() / 2, (availableGeometry.height() * 2) / 3);
+    mw.move((availableGeometry.width() - mw.width()) / 2,
+            (availableGeometry.height() - mw.height()) / 2);
+
+    if (!mw.load(parser.positionalArguments().value(0, QLatin1String(":/example.html"))))
+        mw.fileNew();
+
     mw.show();
     return a.exec();
 }
diff --git a/examples/widgets/richtext/textedit/textedit.cpp b/examples/widgets/richtext/textedit/textedit.cpp
index 6af436ba46..201151c32e 100644
--- a/examples/widgets/richtext/textedit/textedit.cpp
+++ b/examples/widgets/richtext/textedit/textedit.cpp
@@ -45,6 +45,7 @@
 #include <QMenuBar>
 #include <QTextCodec>
 #include <QTextEdit>
+#include <QStatusBar>
 #include <QToolBar>
 #include <QTextCursor>
 #include <QTextDocumentWriter>
@@ -73,6 +74,14 @@ TextEdit::TextEdit(QWidget *parent)
 #ifdef Q_OS_OSX
     setUnifiedTitleAndToolBarOnMac(true);
 #endif
+    setWindowTitle(QCoreApplication::applicationName());
+
+    textEdit = new QTextEdit(this);
+    connect(textEdit, &QTextEdit::currentCharFormatChanged,
+            this, &TextEdit::currentCharFormatChanged);
+    connect(textEdit, &QTextEdit::cursorPositionChanged,
+            this, &TextEdit::cursorPositionChanged);
+    setCentralWidget(textEdit);
 
     setToolButtonStyle(Qt::ToolButtonFollowStyle);
     setupFileActions();
@@ -80,22 +89,11 @@ TextEdit::TextEdit(QWidget *parent)
     setupTextActions();
 
     {
-        QMenu *helpMenu = new QMenu(tr("Help"), this);
-        menuBar()->addMenu(helpMenu);
-        helpMenu->addAction(tr("About"), this, SLOT(about()));
-        helpMenu->addAction(tr("About &Qt"), qApp, SLOT(aboutQt()));
+        QMenu *helpMenu = menuBar()->addMenu(tr("Help"));
+        helpMenu->addAction(tr("About"), this, &TextEdit::about);
+        helpMenu->addAction(tr("About &Qt"), qApp, &QApplication::aboutQt);
     }
 
-    textEdit = new QTextEdit(this);
-    connect(textEdit, SIGNAL(currentCharFormatChanged(QTextCharFormat)),
-            this, SLOT(currentCharFormatChanged(QTextCharFormat)));
-    connect(textEdit, SIGNAL(cursorPositionChanged()),
-            this, SLOT(cursorPositionChanged()));
-
-    setCentralWidget(textEdit);
-    textEdit->setFocus();
-    setCurrentFileName(QString());
-
     QFont textFont("Helvetica");
     textFont.setStyleHint(QFont::SansSerif);
     textEdit->setFont(textFont);
@@ -103,44 +101,29 @@ TextEdit::TextEdit(QWidget *parent)
     colorChanged(textEdit->textColor());
     alignmentChanged(textEdit->alignment());
 
-    connect(textEdit->document(), SIGNAL(modificationChanged(bool)),
-            actionSave, SLOT(setEnabled(bool)));
-    connect(textEdit->document(), SIGNAL(modificationChanged(bool)),
-            this, SLOT(setWindowModified(bool)));
-    connect(textEdit->document(), SIGNAL(undoAvailable(bool)),
-            actionUndo, SLOT(setEnabled(bool)));
-    connect(textEdit->document(), SIGNAL(redoAvailable(bool)),
-            actionRedo, SLOT(setEnabled(bool)));
+    connect(textEdit->document(), &QTextDocument::modificationChanged,
+            actionSave, &QAction::setEnabled);
+    connect(textEdit->document(), &QTextDocument::modificationChanged,
+            this, &QWidget::setWindowModified);
+    connect(textEdit->document(), &QTextDocument::undoAvailable,
+            actionUndo, &QAction::setEnabled);
+    connect(textEdit->document(), &QTextDocument::redoAvailable,
+            actionRedo, &QAction::setEnabled);
 
     setWindowModified(textEdit->document()->isModified());
     actionSave->setEnabled(textEdit->document()->isModified());
     actionUndo->setEnabled(textEdit->document()->isUndoAvailable());
     actionRedo->setEnabled(textEdit->document()->isRedoAvailable());
 
-    connect(actionUndo, SIGNAL(triggered()), textEdit, SLOT(undo()));
-    connect(actionRedo, SIGNAL(triggered()), textEdit, SLOT(redo()));
-
     actionCut->setEnabled(false);
     actionCopy->setEnabled(false);
 
-    connect(actionCut, SIGNAL(triggered()), textEdit, SLOT(cut()));
-    connect(actionCopy, SIGNAL(triggered()), textEdit, SLOT(copy()));
-    connect(actionPaste, SIGNAL(triggered()), textEdit, SLOT(paste()));
-
-    connect(textEdit, SIGNAL(copyAvailable(bool)), actionCut, SLOT(setEnabled(bool)));
-    connect(textEdit, SIGNAL(copyAvailable(bool)), actionCopy, SLOT(setEnabled(bool)));
-
 #ifndef QT_NO_CLIPBOARD
-    connect(QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(clipboardDataChanged()));
+    connect(QApplication::clipboard(), &QClipboard::dataChanged, this, &TextEdit::clipboardDataChanged);
 #endif
 
-    QString initialFile = ":/example.html";
-    const QStringList args = QCoreApplication::arguments();
-    if (args.count() == 2)
-        initialFile = args.at(1);
-
-    if (!load(initialFile))
-        fileNew();
+    textEdit->setFocus();
+    setCurrentFileName(QString());
 }
 
 void TextEdit::closeEvent(QCloseEvent *e)
@@ -153,116 +136,89 @@ void TextEdit::closeEvent(QCloseEvent *e)
 
 void TextEdit::setupFileActions()
 {
-    QToolBar *tb = new QToolBar(this);
-    tb->setWindowTitle(tr("File Actions"));
-    addToolBar(tb);
-
-    QMenu *menu = new QMenu(tr("&File"), this);
-    menuBar()->addMenu(menu);
-
-    QAction *a;
+    QToolBar *tb = addToolBar(tr("File Actions"));
+    QMenu *menu = menuBar()->addMenu(tr("&File"));
 
-    QIcon newIcon = QIcon::fromTheme("document-new", QIcon(rsrcPath + "/filenew.png"));
-    a = new QAction( newIcon, tr("&New"), this);
+    const QIcon newIcon = QIcon::fromTheme("document-new", QIcon(rsrcPath + "/filenew.png"));
+    QAction *a = menu->addAction(newIcon,  tr("&New"), this, &TextEdit::fileNew);
+    tb->addAction(a);
     a->setPriority(QAction::LowPriority);
     a->setShortcut(QKeySequence::New);
-    connect(a, SIGNAL(triggered()), this, SLOT(fileNew()));
-    tb->addAction(a);
-    menu->addAction(a);
 
-    a = new QAction(QIcon::fromTheme("document-open", QIcon(rsrcPath + "/fileopen.png")),
-                    tr("&Open..."), this);
+    const QIcon openIcon = QIcon::fromTheme("document-open", QIcon(rsrcPath + "/fileopen.png"));
+    a = menu->addAction(openIcon, tr("&Open..."), this, &TextEdit::fileOpen);
     a->setShortcut(QKeySequence::Open);
-    connect(a, SIGNAL(triggered()), this, SLOT(fileOpen()));
     tb->addAction(a);
-    menu->addAction(a);
 
     menu->addSeparator();
 
-    actionSave = a = new QAction(QIcon::fromTheme("document-save", QIcon(rsrcPath + "/filesave.png")),
-                                 tr("&Save"), this);
-    a->setShortcut(QKeySequence::Save);
-    connect(a, SIGNAL(triggered()), this, SLOT(fileSave()));
-    a->setEnabled(false);
-    tb->addAction(a);
-    menu->addAction(a);
+    const QIcon saveIcon = QIcon::fromTheme("document-save", QIcon(rsrcPath + "/filesave.png"));
+    actionSave = menu->addAction(saveIcon, tr("&Save"), this, &TextEdit::fileSave);
+    actionSave->setShortcut(QKeySequence::Save);
+    actionSave->setEnabled(false);
+    tb->addAction(actionSave);
 
-    a = new QAction(tr("Save &As..."), this);
+    a = menu->addAction(tr("Save &As..."), this, &TextEdit::fileSaveAs);
     a->setPriority(QAction::LowPriority);
-    connect(a, SIGNAL(triggered()), this, SLOT(fileSaveAs()));
-    menu->addAction(a);
     menu->addSeparator();
 
 #ifndef QT_NO_PRINTER
-    a = new QAction(QIcon::fromTheme("document-print", QIcon(rsrcPath + "/fileprint.png")),
-                    tr("&Print..."), this);
+    const QIcon printIcon = QIcon::fromTheme("document-print", QIcon(rsrcPath + "/fileprint.png"));
+    a = menu->addAction(printIcon, tr("&Print..."), this, &TextEdit::filePrint);
     a->setPriority(QAction::LowPriority);
     a->setShortcut(QKeySequence::Print);
-    connect(a, SIGNAL(triggered()), this, SLOT(filePrint()));
     tb->addAction(a);
-    menu->addAction(a);
 
-    a = new QAction(QIcon::fromTheme("fileprint", QIcon(rsrcPath + "/fileprint.png")),
-                    tr("Print Preview..."), this);
-    connect(a, SIGNAL(triggered()), this, SLOT(filePrintPreview()));
-    menu->addAction(a);
+    const QIcon filePrintIcon = QIcon::fromTheme("fileprint", QIcon(rsrcPath + "/fileprint.png"));
+    menu->addAction(filePrintIcon, tr("Print Preview..."), this, &TextEdit::filePrintPreview);
 
-    a = new QAction(QIcon::fromTheme("exportpdf", QIcon(rsrcPath + "/exportpdf.png")),
-                    tr("&Export PDF..."), this);
+    const QIcon exportPdfIcon = QIcon::fromTheme("exportpdf", QIcon(rsrcPath + "/exportpdf.png"));
+    a = menu->addAction(exportPdfIcon, tr("&Export PDF..."), this, &TextEdit::filePrintPdf);
     a->setPriority(QAction::LowPriority);
     a->setShortcut(Qt::CTRL + Qt::Key_D);
-    connect(a, SIGNAL(triggered()), this, SLOT(filePrintPdf()));
     tb->addAction(a);
-    menu->addAction(a);
 
     menu->addSeparator();
 #endif
 
-    a = new QAction(tr("&Quit"), this);
+    a = menu->addAction(tr("&Quit"), this, &QWidget::close);
     a->setShortcut(Qt::CTRL + Qt::Key_Q);
-    connect(a, SIGNAL(triggered()), this, SLOT(close()));
-    menu->addAction(a);
 }
 
 void TextEdit::setupEditActions()
 {
-    QToolBar *tb = new QToolBar(this);
-    tb->setWindowTitle(tr("Edit Actions"));
-    addToolBar(tb);
-    QMenu *menu = new QMenu(tr("&Edit"), this);
-    menuBar()->addMenu(menu);
+    QToolBar *tb = addToolBar(tr("Edit Actions"));
+    QMenu *menu = menuBar()->addMenu(tr("&Edit"));
 
-    QAction *a;
-    a = actionUndo = new QAction(QIcon::fromTheme("edit-undo", QIcon(rsrcPath + "/editundo.png")),
-                                              tr("&Undo"), this);
-    a->setShortcut(QKeySequence::Undo);
-    tb->addAction(a);
-    menu->addAction(a);
-    a = actionRedo = new QAction(QIcon::fromTheme("edit-redo", QIcon(rsrcPath + "/editredo.png")),
-                                              tr("&Redo"), this);
-    a->setPriority(QAction::LowPriority);
-    a->setShortcut(QKeySequence::Redo);
-    tb->addAction(a);
-    menu->addAction(a);
+    const QIcon undoIcon = QIcon::fromTheme("edit-undo", QIcon(rsrcPath + "/editundo.png"));
+    actionUndo = menu->addAction(undoIcon, tr("&Undo"), textEdit, &QTextEdit::undo);
+    actionUndo->setShortcut(QKeySequence::Undo);
+    tb->addAction(actionUndo);
+
+    const QIcon redoIcon = QIcon::fromTheme("edit-redo", QIcon(rsrcPath + "/editredo.png"));
+    actionRedo = menu->addAction(redoIcon, tr("&Redo"), textEdit, &QTextEdit::redo);
+    actionRedo->setPriority(QAction::LowPriority);
+    actionRedo->setShortcut(QKeySequence::Redo);
+    tb->addAction(actionRedo);
     menu->addSeparator();
-    a = actionCut = new QAction(QIcon::fromTheme("edit-cut", QIcon(rsrcPath + "/editcut.png")),
-                                             tr("Cu&t"), this);
-    a->setPriority(QAction::LowPriority);
-    a->setShortcut(QKeySequence::Cut);
-    tb->addAction(a);
-    menu->addAction(a);
-    a = actionCopy = new QAction(QIcon::fromTheme("edit-copy", QIcon(rsrcPath + "/editcopy.png")),
-                                 tr("&Copy"), this);
-    a->setPriority(QAction::LowPriority);
-    a->setShortcut(QKeySequence::Copy);
-    tb->addAction(a);
-    menu->addAction(a);
-    a = actionPaste = new QAction(QIcon::fromTheme("edit-paste", QIcon(rsrcPath + "/editpaste.png")),
-                                  tr("&Paste"), this);
-    a->setPriority(QAction::LowPriority);
-    a->setShortcut(QKeySequence::Paste);
-    tb->addAction(a);
-    menu->addAction(a);
+
+    const QIcon cutIcon = QIcon::fromTheme("edit-cut", QIcon(rsrcPath + "/editcut.png"));
+    actionCut = menu->addAction(cutIcon, tr("Cu&t"), textEdit, &QTextEdit::cut);
+    actionCut->setPriority(QAction::LowPriority);
+    actionCut->setShortcut(QKeySequence::Cut);
+    tb->addAction(actionCut);
+
+    const QIcon copyIcon = QIcon::fromTheme("edit-copy", QIcon(rsrcPath + "/editcopy.png"));
+    actionCopy = menu->addAction(copyIcon, tr("&Copy"), textEdit, &QTextEdit::copy);
+    actionCopy->setPriority(QAction::LowPriority);
+    actionCopy->setShortcut(QKeySequence::Copy);
+    tb->addAction(actionCopy);
+
+    const QIcon pasteIcon = QIcon::fromTheme("edit-paste", QIcon(rsrcPath + "/editpaste.png"));
+    actionPaste = menu->addAction(pasteIcon, tr("&Paste"), textEdit, &QTextEdit::paste);
+    actionPaste->setPriority(QAction::LowPriority);
+    actionPaste->setShortcut(QKeySequence::Paste);
+    tb->addAction(actionPaste);
 #ifndef QT_NO_CLIPBOARD
     if (const QMimeData *md = QApplication::clipboard()->mimeData())
         actionPaste->setEnabled(md->hasText());
@@ -271,110 +227,89 @@ void TextEdit::setupEditActions()
 
 void TextEdit::setupTextActions()
 {
-    QToolBar *tb = new QToolBar(this);
-    tb->setWindowTitle(tr("Format Actions"));
-    addToolBar(tb);
-
-    QMenu *menu = new QMenu(tr("F&ormat"), this);
-    menuBar()->addMenu(menu);
+    QToolBar *tb = addToolBar(tr("Format Actions"));
+    QMenu *menu = menuBar()->addMenu(tr("F&ormat"));
 
-    actionTextBold = new QAction(QIcon::fromTheme("format-text-bold", QIcon(rsrcPath + "/textbold.png")),
-                                 tr("&Bold"), this);
+    const QIcon boldIcon = QIcon::fromTheme("format-text-bold", QIcon(rsrcPath + "/textbold.png"));
+    actionTextBold = menu->addAction(boldIcon, tr("&Bold"), this, &TextEdit::textBold);
     actionTextBold->setShortcut(Qt::CTRL + Qt::Key_B);
     actionTextBold->setPriority(QAction::LowPriority);
     QFont bold;
     bold.setBold(true);
     actionTextBold->setFont(bold);
-    connect(actionTextBold, SIGNAL(triggered()), this, SLOT(textBold()));
     tb->addAction(actionTextBold);
-    menu->addAction(actionTextBold);
     actionTextBold->setCheckable(true);
 
-    actionTextItalic = new QAction(QIcon::fromTheme("format-text-italic",
-                                                    QIcon(rsrcPath + "/textitalic.png")),
-                                   tr("&Italic"), this);
+    const QIcon italicIcon = QIcon::fromTheme("format-text-italic", QIcon(rsrcPath + "/textitalic.png"));
+    actionTextItalic = menu->addAction(italicIcon, tr("&Italic"), this, &TextEdit::textItalic);
     actionTextItalic->setPriority(QAction::LowPriority);
     actionTextItalic->setShortcut(Qt::CTRL + Qt::Key_I);
     QFont italic;
     italic.setItalic(true);
     actionTextItalic->setFont(italic);
-    connect(actionTextItalic, SIGNAL(triggered()), this, SLOT(textItalic()));
     tb->addAction(actionTextItalic);
-    menu->addAction(actionTextItalic);
     actionTextItalic->setCheckable(true);
 
-    actionTextUnderline = new QAction(QIcon::fromTheme("format-text-underline",
-                                                       QIcon(rsrcPath + "/textunder.png")),
-                                      tr("&Underline"), this);
+    const QIcon underlineIcon = QIcon::fromTheme("format-text-underline", QIcon(rsrcPath + "/textunder.png"));
+    actionTextUnderline = menu->addAction(underlineIcon, tr("&Underline"), this, &TextEdit::textUnderline);
     actionTextUnderline->setShortcut(Qt::CTRL + Qt::Key_U);
     actionTextUnderline->setPriority(QAction::LowPriority);
     QFont underline;
     underline.setUnderline(true);
     actionTextUnderline->setFont(underline);
-    connect(actionTextUnderline, SIGNAL(triggered()), this, SLOT(textUnderline()));
     tb->addAction(actionTextUnderline);
-    menu->addAction(actionTextUnderline);
     actionTextUnderline->setCheckable(true);
 
     menu->addSeparator();
 
-    QActionGroup *grp = new QActionGroup(this);
-    connect(grp, SIGNAL(triggered(QAction*)), this, SLOT(textAlign(QAction*)));
-
-    // Make sure the alignLeft  is always left of the alignRight
-    if (QApplication::isLeftToRight()) {
-        actionAlignLeft = new QAction(QIcon::fromTheme("format-justify-left",
-                                                       QIcon(rsrcPath + "/textleft.png")),
-                                      tr("&Left"), grp);
-        actionAlignCenter = new QAction(QIcon::fromTheme("format-justify-center",
-                                                         QIcon(rsrcPath + "/textcenter.png")),
-                                        tr("C&enter"), grp);
-        actionAlignRight = new QAction(QIcon::fromTheme("format-justify-right",
-                                                        QIcon(rsrcPath + "/textright.png")),
-                                       tr("&Right"), grp);
-    } else {
-        actionAlignRight = new QAction(QIcon::fromTheme("format-justify-right",
-                                                        QIcon(rsrcPath + "/textright.png")),
-                                       tr("&Right"), grp);
-        actionAlignCenter = new QAction(QIcon::fromTheme("format-justify-center",
-                                                         QIcon(rsrcPath + "/textcenter.png")),
-                                        tr("C&enter"), grp);
-        actionAlignLeft = new QAction(QIcon::fromTheme("format-justify-left",
-                                                       QIcon(rsrcPath + "/textleft.png")),
-                                      tr("&Left"), grp);
-    }
-    actionAlignJustify = new QAction(QIcon::fromTheme("format-justify-fill",
-                                                      QIcon(rsrcPath + "/textjustify.png")),
-                                     tr("&Justify"), grp);
-
+    const QIcon leftIcon = QIcon::fromTheme("format-justify-left", QIcon(rsrcPath + "/textleft.png"));
+    actionAlignLeft = new QAction(leftIcon, tr("&Left"), this);
     actionAlignLeft->setShortcut(Qt::CTRL + Qt::Key_L);
     actionAlignLeft->setCheckable(true);
     actionAlignLeft->setPriority(QAction::LowPriority);
+    const QIcon centerIcon = QIcon::fromTheme("format-justify-center", QIcon(rsrcPath + "/textcenter.png"));
+    actionAlignCenter = new QAction(centerIcon, tr("C&enter"), this);
     actionAlignCenter->setShortcut(Qt::CTRL + Qt::Key_E);
     actionAlignCenter->setCheckable(true);
     actionAlignCenter->setPriority(QAction::LowPriority);
+    const QIcon rightIcon = QIcon::fromTheme("format-justify-right", QIcon(rsrcPath + "/textright.png"));
+    actionAlignRight = new QAction(rightIcon, tr("&Right"), this);
     actionAlignRight->setShortcut(Qt::CTRL + Qt::Key_R);
     actionAlignRight->setCheckable(true);
     actionAlignRight->setPriority(QAction::LowPriority);
+    const QIcon fillIcon = QIcon::fromTheme("format-justify-fill", QIcon(rsrcPath + "/textjustify.png"));
+    actionAlignJustify = new QAction(fillIcon, tr("&Justify"), this);
     actionAlignJustify->setShortcut(Qt::CTRL + Qt::Key_J);
     actionAlignJustify->setCheckable(true);
     actionAlignJustify->setPriority(QAction::LowPriority);
 
-    tb->addActions(grp->actions());
-    menu->addActions(grp->actions());
+    // Make sure the alignLeft  is always left of the alignRight
+    QActionGroup *alignGroup = new QActionGroup(this);
+    connect(alignGroup, &QActionGroup::triggered, this, &TextEdit::textAlign);
+
+    if (QApplication::isLeftToRight()) {
+        alignGroup->addAction(actionAlignLeft);
+        alignGroup->addAction(actionAlignCenter);
+        alignGroup->addAction(actionAlignRight);
+    } else {
+        alignGroup->addAction(actionAlignRight);
+        alignGroup->addAction(actionAlignCenter);
+        alignGroup->addAction(actionAlignLeft);
+    }
+    alignGroup->addAction(actionAlignJustify);
+
+    tb->addActions(alignGroup->actions());
+    menu->addActions(alignGroup->actions());
 
     menu->addSeparator();
 
     QPixmap pix(16, 16);
     pix.fill(Qt::black);
-    actionTextColor = new QAction(pix, tr("&Color..."), this);
-    connect(actionTextColor, SIGNAL(triggered()), this, SLOT(textColor()));
+    actionTextColor = menu->addAction(pix, tr("&Color..."), this, &TextEdit::textColor);
     tb->addAction(actionTextColor);
-    menu->addAction(actionTextColor);
 
-    tb = new QToolBar(this);
+    tb = addToolBar(tr("Format Actions"));
     tb->setAllowedAreas(Qt::TopToolBarArea | Qt::BottomToolBarArea);
-    tb->setWindowTitle(tr("Format Actions"));
     addToolBarBreak(Qt::TopToolBarArea);
     addToolBar(tb);
 
@@ -389,24 +324,26 @@ void TextEdit::setupTextActions()
     comboStyle->addItem("Ordered List (Alpha upper)");
     comboStyle->addItem("Ordered List (Roman lower)");
     comboStyle->addItem("Ordered List (Roman upper)");
-    connect(comboStyle, SIGNAL(activated(int)), this, SLOT(textStyle(int)));
 
+    typedef void (QComboBox::*QComboIntSignal)(int);
+    connect(comboStyle, static_cast<QComboIntSignal>(&QComboBox::activated), this, &TextEdit::textStyle);
+
+    typedef void (QComboBox::*QComboStringSignal)(const QString &);
     comboFont = new QFontComboBox(tb);
     tb->addWidget(comboFont);
-    connect(comboFont, SIGNAL(activated(QString)), this, SLOT(textFamily(QString)));
+    connect(comboFont, static_cast<QComboStringSignal>(&QComboBox::activated), this, &TextEdit::textFamily);
 
     comboSize = new QComboBox(tb);
     comboSize->setObjectName("comboSize");
     tb->addWidget(comboSize);
     comboSize->setEditable(true);
 
-    QFontDatabase db;
-    foreach(int size, db.standardSizes())
+    const QList<int> standardSizes = QFontDatabase::standardSizes();
+    foreach (int size, standardSizes)
         comboSize->addItem(QString::number(size));
+    comboSize->setCurrentIndex(standardSizes.indexOf(QApplication::font().pointSize()));
 
-    connect(comboSize, SIGNAL(activated(QString)), this, SLOT(textSize(QString)));
-    comboSize->setCurrentIndex(comboSize->findText(QString::number(QApplication::font()
-                                                                   .pointSize())));
+    connect(comboSize, static_cast<QComboStringSignal>(&QComboBox::activated), this, &TextEdit::textSize);
 }
 
 bool TextEdit::load(const QString &f)
@@ -436,11 +373,11 @@ bool TextEdit::maybeSave()
     if (!textEdit->document()->isModified())
         return true;
 
-    QMessageBox::StandardButton ret;
-    ret = QMessageBox::warning(this, tr("Application"),
-                               tr("The document has been modified.\n"
-                                  "Do you want to save your changes?"),
-                               QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
+    const QMessageBox::StandardButton ret =
+        QMessageBox::warning(this, QCoreApplication::applicationName(),
+                             tr("The document has been modified.\n"
+                                "Do you want to save your changes?"),
+                             QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
     if (ret == QMessageBox::Save)
         return fileSave();
     else if (ret == QMessageBox::Cancel)
@@ -459,7 +396,7 @@ void TextEdit::setCurrentFileName(const QString &fileName)
     else
         shownName = QFileInfo(fileName).fileName();
 
-    setWindowTitle(tr("%1[*] - %2").arg(shownName).arg(tr("Rich Text")));
+    setWindowTitle(tr("%1[*] - %2").arg(shownName, QCoreApplication::applicationName()));
     setWindowModified(false);
 }
 
@@ -473,10 +410,17 @@ void TextEdit::fileNew()
 
 void TextEdit::fileOpen()
 {
-    QString fn = QFileDialog::getOpenFileName(this, tr("Open File..."),
-                                              QString(), tr("HTML-Files (*.htm *.html);;All Files (*)"));
-    if (!fn.isEmpty())
-        load(fn);
+    QFileDialog fileDialog(this, tr("Open File..."));
+    fileDialog.setAcceptMode(QFileDialog::AcceptOpen);
+    fileDialog.setFileMode(QFileDialog::ExistingFile);
+    fileDialog.setMimeTypeFilters(QStringList() << "text/html" << "text/plain");
+    if (fileDialog.exec() != QDialog::Accepted)
+        return;
+    const QString fn = fileDialog.selectedFiles().first();
+    if (load(fn))
+        statusBar()->showMessage(tr("Opened \"%1\"").arg(QDir::toNativeSeparators(fn)));
+    else
+        statusBar()->showMessage(tr("Could not open \"%1\"").arg(QDir::toNativeSeparators(fn)));
 }
 
 bool TextEdit::fileSave()
@@ -488,23 +432,27 @@ bool TextEdit::fileSave()
 
     QTextDocumentWriter writer(fileName);
     bool success = writer.write(textEdit->document());
-    if (success)
+    if (success) {
         textEdit->document()->setModified(false);
+        statusBar()->showMessage(tr("Wrote \"%1\"").arg(QDir::toNativeSeparators(fileName)));
+    } else {
+        statusBar()->showMessage(tr("Could not write to file \"%1\"")
+                                 .arg(QDir::toNativeSeparators(fileName)));
+    }
     return success;
 }
 
 bool TextEdit::fileSaveAs()
 {
-    QString fn = QFileDialog::getSaveFileName(this, tr("Save as..."), QString(),
-                                              tr("ODF files (*.odt);;HTML-Files "
-                                                 "(*.htm *.html);;All Files (*)"));
-    if (fn.isEmpty())
+    QFileDialog fileDialog(this, tr("Save as..."));
+    fileDialog.setAcceptMode(QFileDialog::AcceptSave);
+    QStringList mimeTypes;
+    mimeTypes << "application/vnd.oasis.opendocument.text" << "text/html" << "text/plain";
+    fileDialog.setMimeTypeFilters(mimeTypes);
+    fileDialog.setDefaultSuffix("odt");
+    if (fileDialog.exec() != QDialog::Accepted)
         return false;
-    if (!(fn.endsWith(".odt", Qt::CaseInsensitive)
-          || fn.endsWith(".htm", Qt::CaseInsensitive)
-          || fn.endsWith(".html", Qt::CaseInsensitive))) {
-        fn += ".odt"; // default
-    }
+    const QString fn = fileDialog.selectedFiles().first();
     setCurrentFileName(fn);
     return fileSave();
 }
@@ -528,7 +476,7 @@ void TextEdit::filePrintPreview()
 #if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG)
     QPrinter printer(QPrinter::HighResolution);
     QPrintPreviewDialog preview(&printer, this);
-    connect(&preview, SIGNAL(paintRequested(QPrinter*)), SLOT(printPreview(QPrinter*)));
+    connect(&preview, &QPrintPreviewDialog::paintRequested, this, &TextEdit::printPreview);
     preview.exec();
 #endif
 }
@@ -547,16 +495,19 @@ void TextEdit::filePrintPdf()
 {
 #ifndef QT_NO_PRINTER
 //! [0]
-    QString fileName = QFileDialog::getSaveFileName(this, "Export PDF",
-                                                    QString(), "*.pdf");
-    if (!fileName.isEmpty()) {
-        if (QFileInfo(fileName).suffix().isEmpty())
-            fileName.append(".pdf");
-        QPrinter printer(QPrinter::HighResolution);
-        printer.setOutputFormat(QPrinter::PdfFormat);
-        printer.setOutputFileName(fileName);
-        textEdit->document()->print(&printer);
-    }
+    QFileDialog fileDialog(this, tr("Export PDF"));
+    fileDialog.setAcceptMode(QFileDialog::AcceptSave);
+    fileDialog.setMimeTypeFilters(QStringList("application/pdf"));
+    fileDialog.setDefaultSuffix("pdf");
+    if (fileDialog.exec() != QDialog::Accepted)
+        return;
+    QString fileName = fileDialog.selectedFiles().first();
+    QPrinter printer(QPrinter::HighResolution);
+    printer.setOutputFormat(QPrinter::PdfFormat);
+    printer.setOutputFileName(fileName);
+    textEdit->document()->print(&printer);
+    statusBar()->showMessage(tr("Exported \"%1\"")
+                             .arg(QDir::toNativeSeparators(fileName)));
 //! [0]
 #endif
 }
diff --git a/examples/widgets/richtext/textedit/textedit.h b/examples/widgets/richtext/textedit/textedit.h
index dade2b9edf..b338493d83 100644
--- a/examples/widgets/richtext/textedit/textedit.h
+++ b/examples/widgets/richtext/textedit/textedit.h
@@ -55,19 +55,15 @@ class TextEdit : public QMainWindow
 public:
     TextEdit(QWidget *parent = 0);
 
+    bool load(const QString &f);
+
+public slots:
+    void fileNew();
+
 protected:
     virtual void closeEvent(QCloseEvent *e) Q_DECL_OVERRIDE;
 
-private:
-    void setupFileActions();
-    void setupEditActions();
-    void setupTextActions();
-    bool load(const QString &f);
-    bool maybeSave();
-    void setCurrentFileName(const QString &fileName);
-
 private slots:
-    void fileNew();
     void fileOpen();
     bool fileSave();
     bool fileSaveAs();
@@ -92,6 +88,12 @@ private slots:
     void printPreview(QPrinter *);
 
 private:
+    void setupFileActions();
+    void setupEditActions();
+    void setupTextActions();
+    bool maybeSave();
+    void setCurrentFileName(const QString &fileName);
+
     void mergeFormatOnWordOrSelection(const QTextCharFormat &format);
     void fontChanged(const QFont &f);
     void colorChanged(const QColor &c);
diff --git a/examples/widgets/tools/settingseditor/locationdialog.cpp b/examples/widgets/tools/settingseditor/locationdialog.cpp
index 31c221f5d9..ad7f7e2ce5 100644
--- a/examples/widgets/tools/settingseditor/locationdialog.cpp
+++ b/examples/widgets/tools/settingseditor/locationdialog.cpp
@@ -54,17 +54,18 @@ LocationDialog::LocationDialog(QWidget *parent)
     scopeComboBox->addItem(tr("System"));
 
     organizationComboBox = new QComboBox;
-    organizationComboBox->addItem(tr("Qt"));
+    organizationComboBox->addItem(tr("QtProject"));
     organizationComboBox->setEditable(true);
 
     applicationComboBox = new QComboBox;
     applicationComboBox->addItem(tr("Any"));
+    applicationComboBox->addItem(tr("Qt Creator"));
     applicationComboBox->addItem(tr("Application Example"));
     applicationComboBox->addItem(tr("Assistant"));
     applicationComboBox->addItem(tr("Designer"));
     applicationComboBox->addItem(tr("Linguist"));
     applicationComboBox->setEditable(true);
-    applicationComboBox->setCurrentIndex(3);
+    applicationComboBox->setCurrentIndex(1);
 
     formatLabel = new QLabel(tr("&Format:"));
     formatLabel->setBuddy(formatComboBox);
@@ -91,28 +92,30 @@ LocationDialog::LocationDialog(QWidget *parent)
     locationsTable->setHorizontalHeaderLabels(labels);
     locationsTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
     locationsTable->horizontalHeader()->resizeSection(1, 180);
+    connect(locationsTable, &QTableWidget::itemActivated, this, &LocationDialog::itemActivated);
 
-    buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok
-                                     | QDialogButtonBox::Cancel);
+    buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
 
-    connect(formatComboBox, SIGNAL(activated(int)),
-            this, SLOT(updateLocationsTable()));
-    connect(scopeComboBox, SIGNAL(activated(int)),
-            this, SLOT(updateLocationsTable()));
+    typedef void (QComboBox::*QComboIntSignal)(int);
+    connect(formatComboBox, static_cast<QComboIntSignal>(&QComboBox::activated),
+            this, &LocationDialog::updateLocationsTable);
+    connect(scopeComboBox, static_cast<QComboIntSignal>(&QComboBox::activated),
+            this, &LocationDialog::updateLocationsTable);
     connect(organizationComboBox->lineEdit(),
-            SIGNAL(editingFinished()),
-            this, SLOT(updateLocationsTable()));
+            &QLineEdit::editingFinished,
+            this, &LocationDialog::updateLocationsTable);
     connect(applicationComboBox->lineEdit(),
-            SIGNAL(editingFinished()),
-            this, SLOT(updateLocationsTable()));
-    connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
-    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
-
-    QVBoxLayout *locationsLayout = new QVBoxLayout;
+            &QLineEdit::editingFinished,
+            this, &LocationDialog::updateLocationsTable);
+    connect(applicationComboBox, static_cast<QComboIntSignal>(&QComboBox::activated),
+            this, &LocationDialog::updateLocationsTable);
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+
+    QVBoxLayout *locationsLayout = new QVBoxLayout(locationsGroupBox);
     locationsLayout->addWidget(locationsTable);
-    locationsGroupBox->setLayout(locationsLayout);
 
-    QGridLayout *mainLayout = new QGridLayout;
+    QGridLayout *mainLayout = new QGridLayout(this);
     mainLayout->addWidget(formatLabel, 0, 0);
     mainLayout->addWidget(formatComboBox, 0, 1);
     mainLayout->addWidget(scopeLabel, 1, 0);
@@ -123,7 +126,6 @@ LocationDialog::LocationDialog(QWidget *parent)
     mainLayout->addWidget(applicationComboBox, 3, 1);
     mainLayout->addWidget(locationsGroupBox, 4, 0, 1, 2);
     mainLayout->addWidget(buttonBox, 5, 0, 1, 2);
-    setLayout(mainLayout);
 
     updateLocationsTable();
 
@@ -155,11 +157,16 @@ QString LocationDialog::organization() const
 QString LocationDialog::application() const
 {
     if (applicationComboBox->currentText() == tr("Any"))
-        return "";
+        return QString();
     else
         return applicationComboBox->currentText();
 }
 
+void LocationDialog::itemActivated(QTableWidgetItem *)
+{
+    buttonBox->button(QDialogButtonBox::Ok)->animateClick();
+}
+
 void LocationDialog::updateLocationsTable()
 {
     locationsTable->setUpdatesEnabled(false);
@@ -184,8 +191,7 @@ void LocationDialog::updateLocationsTable()
             int row = locationsTable->rowCount();
             locationsTable->setRowCount(row + 1);
 
-            QTableWidgetItem *item0 = new QTableWidgetItem;
-            item0->setText(settings.fileName());
+            QTableWidgetItem *item0 = new QTableWidgetItem(QDir::toNativeSeparators(settings.fileName()));
 
             QTableWidgetItem *item1 = new QTableWidgetItem;
             bool disable = (settings.childKeys().isEmpty()
diff --git a/examples/widgets/tools/settingseditor/locationdialog.h b/examples/widgets/tools/settingseditor/locationdialog.h
index 5bb68d54df..d6f0225a31 100644
--- a/examples/widgets/tools/settingseditor/locationdialog.h
+++ b/examples/widgets/tools/settingseditor/locationdialog.h
@@ -50,6 +50,7 @@ class QDialogButtonBox;
 class QGroupBox;
 class QLabel;
 class QTableWidget;
+class QTableWidgetItem;
 QT_END_NAMESPACE
 
 class LocationDialog : public QDialog
@@ -66,6 +67,7 @@ public:
 
 private slots:
     void updateLocationsTable();
+    void itemActivated(QTableWidgetItem *);
 
 private:
     QLabel *formatLabel;
diff --git a/examples/widgets/tools/settingseditor/main.cpp b/examples/widgets/tools/settingseditor/main.cpp
index 842a474405..0947efd817 100644
--- a/examples/widgets/tools/settingseditor/main.cpp
+++ b/examples/widgets/tools/settingseditor/main.cpp
@@ -45,6 +45,9 @@
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
+    QCoreApplication::setApplicationName("Settings Editor");
+    QCoreApplication::setApplicationVersion(QT_VERSION_STR);
+
     MainWindow mainWin;
     mainWin.show();
     return app.exec();
diff --git a/examples/widgets/tools/settingseditor/mainwindow.cpp b/examples/widgets/tools/settingseditor/mainwindow.cpp
index 078a84576d..dbc8309eef 100644
--- a/examples/widgets/tools/settingseditor/mainwindow.cpp
+++ b/examples/widgets/tools/settingseditor/mainwindow.cpp
@@ -45,20 +45,20 @@
 #include "settingstree.h"
 
 MainWindow::MainWindow()
+    : settingsTree(new SettingsTree)
+    , locationDialog(Q_NULLPTR)
 {
-    settingsTree = new SettingsTree;
     setCentralWidget(settingsTree);
 
-    locationDialog = 0;
-
     createActions();
-    createMenus();
 
     autoRefreshAct->setChecked(true);
     fallbacksAct->setChecked(true);
 
-    setWindowTitle(tr("Settings Editor"));
-    resize(500, 600);
+    setWindowTitle(QCoreApplication::applicationName());
+    const QRect availableGeometry = QApplication::desktop()->availableGeometry(this);
+    adjustSize();
+    move((availableGeometry.width() - width()) / 2, (availableGeometry.height() - height()) / 2);
 }
 
 void MainWindow::openSettings()
@@ -66,49 +66,60 @@ void MainWindow::openSettings()
     if (!locationDialog)
         locationDialog = new LocationDialog(this);
 
-    if (locationDialog->exec()) {
-        QSettings *settings = new QSettings(locationDialog->format(),
-                                            locationDialog->scope(),
-                                            locationDialog->organization(),
-                                            locationDialog->application());
-        setSettingsObject(settings);
-        fallbacksAct->setEnabled(true);
-    }
+    if (locationDialog->exec() != QDialog::Accepted)
+        return;
+
+    SettingsPtr settings(new QSettings(locationDialog->format(),
+                                       locationDialog->scope(),
+                                       locationDialog->organization(),
+                                       locationDialog->application()));
+
+    setSettingsObject(settings);
+    fallbacksAct->setEnabled(true);
 }
 
 void MainWindow::openIniFile()
 {
-    QString fileName = QFileDialog::getOpenFileName(this, tr("Open INI File"),
-                               "", tr("INI Files (*.ini *.conf)"));
-    if (!fileName.isEmpty()) {
-        QSettings *settings = new QSettings(fileName, QSettings::IniFormat);
-        setSettingsObject(settings);
-        fallbacksAct->setEnabled(false);
-    }
+    const QString directory = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation);
+    const QString fileName =
+        QFileDialog::getOpenFileName(this, tr("Open INI File"),
+                                     directory, tr("INI Files (*.ini *.conf)"));
+    if (fileName.isEmpty())
+        return;
+
+    SettingsPtr settings(new QSettings(fileName, QSettings::IniFormat));
+
+    setSettingsObject(settings);
+    fallbacksAct->setEnabled(false);
 }
 
 void MainWindow::openPropertyList()
 {
-    QString fileName = QFileDialog::getOpenFileName(this,
-                               tr("Open Property List"),
-                               "", tr("Property List Files (*.plist)"));
-    if (!fileName.isEmpty()) {
-        QSettings *settings = new QSettings(fileName, QSettings::NativeFormat);
-        setSettingsObject(settings);
-        fallbacksAct->setEnabled(false);
-    }
+    const QString directory = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation);
+    const QString fileName =
+        QFileDialog::getOpenFileName(this, tr("Open Property List"),
+                                     directory, tr("Property List Files (*.plist)"));
+    if (fileName.isEmpty())
+        return;
+
+    SettingsPtr settings(new QSettings(fileName, QSettings::NativeFormat));
+    setSettingsObject(settings);
+    fallbacksAct->setEnabled(false);
 }
 
 void MainWindow::openRegistryPath()
 {
-    QString path = QInputDialog::getText(this, tr("Open Registry Path"),
-                           tr("Enter the path in the Windows registry:"),
-                           QLineEdit::Normal, "HKEY_CURRENT_USER\\");
-    if (!path.isEmpty()) {
-        QSettings *settings = new QSettings(path, QSettings::NativeFormat);
-        setSettingsObject(settings);
-        fallbacksAct->setEnabled(false);
-    }
+    const QString path =
+        QInputDialog::getText(this, tr("Open Registry Path"),
+                              tr("Enter the path in the Windows registry:"),
+                              QLineEdit::Normal, "HKEY_CURRENT_USER\\");
+    if (path.isEmpty())
+        return;
+
+    SettingsPtr settings(new QSettings(path, QSettings::NativeFormat));
+
+    setSettingsObject(settings);
+    fallbacksAct->setEnabled(false);
 }
 
 void MainWindow::about()
@@ -120,88 +131,59 @@ void MainWindow::about()
 
 void MainWindow::createActions()
 {
-    openSettingsAct = new QAction(tr("&Open Application Settings..."), this);
+    QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
+
+    QAction *openSettingsAct = fileMenu->addAction(tr("&Open Application Settings..."), this, &MainWindow::openSettings);
     openSettingsAct->setShortcuts(QKeySequence::Open);
-    connect(openSettingsAct, SIGNAL(triggered()), this, SLOT(openSettings()));
 
-    openIniFileAct = new QAction(tr("Open I&NI File..."), this);
+    QAction *openIniFileAct = fileMenu->addAction(tr("Open I&NI File..."), this, &MainWindow::openIniFile);
     openIniFileAct->setShortcut(tr("Ctrl+N"));
-    connect(openIniFileAct, SIGNAL(triggered()), this, SLOT(openIniFile()));
 
-    openPropertyListAct = new QAction(tr("Open Mac &Property List..."), this);
+#ifdef Q_OS_OSX
+    QAction *openPropertyListAct = fileMenu->addAction(tr("Open Apple &Property List..."), this, &MainWindow::openPropertyList);
     openPropertyListAct->setShortcut(tr("Ctrl+P"));
-    connect(openPropertyListAct, SIGNAL(triggered()),
-            this, SLOT(openPropertyList()));
+#endif // Q_OS_OSX
 
-    openRegistryPathAct = new QAction(tr("Open Windows &Registry Path..."),
-                                      this);
+#ifdef Q_OS_WIN
+    QAction *openRegistryPathAct = fileMenu->addAction(tr("Open Windows &Registry Path..."), this, &MainWindow::openRegistryPath);
     openRegistryPathAct->setShortcut(tr("Ctrl+G"));
-    connect(openRegistryPathAct, SIGNAL(triggered()),
-            this, SLOT(openRegistryPath()));
+#endif // Q_OS_WIN
+
+    fileMenu->addSeparator();
 
-    refreshAct = new QAction(tr("&Refresh"), this);
+    refreshAct = fileMenu->addAction(tr("&Refresh"), settingsTree, &SettingsTree::refresh);
     refreshAct->setShortcut(tr("Ctrl+R"));
     refreshAct->setEnabled(false);
-    connect(refreshAct, SIGNAL(triggered()), settingsTree, SLOT(refresh()));
 
-    exitAct = new QAction(tr("E&xit"), this);
+    fileMenu->addSeparator();
+
+    QAction *exitAct = fileMenu->addAction(tr("E&xit"), this, &QWidget::close);
     exitAct->setShortcuts(QKeySequence::Quit);
-    connect(exitAct, SIGNAL(triggered()), this, SLOT(close()));
 
-    autoRefreshAct = new QAction(tr("&Auto-Refresh"), this);
+    QMenu *optionsMenu = menuBar()->addMenu(tr("&Options"));
+
+    autoRefreshAct = optionsMenu->addAction(tr("&Auto-Refresh"));
     autoRefreshAct->setShortcut(tr("Ctrl+A"));
     autoRefreshAct->setCheckable(true);
     autoRefreshAct->setEnabled(false);
-    connect(autoRefreshAct, SIGNAL(triggered(bool)),
-            settingsTree, SLOT(setAutoRefresh(bool)));
-    connect(autoRefreshAct, SIGNAL(triggered(bool)),
-            refreshAct, SLOT(setDisabled(bool)));
+    connect(autoRefreshAct, &QAction::triggered,
+            settingsTree, &SettingsTree::setAutoRefresh);
+    connect(autoRefreshAct, &QAction::triggered,
+            refreshAct, &QAction::setDisabled);
 
-    fallbacksAct = new QAction(tr("&Fallbacks"), this);
+    fallbacksAct = optionsMenu->addAction(tr("&Fallbacks"));
     fallbacksAct->setShortcut(tr("Ctrl+F"));
     fallbacksAct->setCheckable(true);
     fallbacksAct->setEnabled(false);
-    connect(fallbacksAct, SIGNAL(triggered(bool)),
-            settingsTree, SLOT(setFallbacksEnabled(bool)));
-
-    aboutAct = new QAction(tr("&About"), this);
-    connect(aboutAct, SIGNAL(triggered()), this, SLOT(about()));
-
-    aboutQtAct = new QAction(tr("About &Qt"), this);
-    connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
-
-#ifndef Q_OS_MAC
-    openPropertyListAct->setEnabled(false);
-#endif
-#ifndef Q_OS_WIN
-    openRegistryPathAct->setEnabled(false);
-#endif
-}
-
-void MainWindow::createMenus()
-{
-    fileMenu = menuBar()->addMenu(tr("&File"));
-    fileMenu->addAction(openSettingsAct);
-    fileMenu->addAction(openIniFileAct);
-    fileMenu->addAction(openPropertyListAct);
-    fileMenu->addAction(openRegistryPathAct);
-    fileMenu->addSeparator();
-    fileMenu->addAction(refreshAct);
-    fileMenu->addSeparator();
-    fileMenu->addAction(exitAct);
-
-    optionsMenu = menuBar()->addMenu(tr("&Options"));
-    optionsMenu->addAction(autoRefreshAct);
-    optionsMenu->addAction(fallbacksAct);
-
-    menuBar()->addSeparator();
+    connect(fallbacksAct, &QAction::triggered,
+            settingsTree, &SettingsTree::setFallbacksEnabled);
 
-    helpMenu = menuBar()->addMenu(tr("&Help"));
-    helpMenu->addAction(aboutAct);
-    helpMenu->addAction(aboutQtAct);
+    QMenu *helpMenu = menuBar()->addMenu(tr("&Help"));
+    helpMenu->addAction(tr("&About"), this, &MainWindow::about);
+    helpMenu->addAction(tr("About &Qt"), qApp, &QCoreApplication::quit);
 }
 
-void MainWindow::setSettingsObject(QSettings *settings)
+void MainWindow::setSettingsObject(const SettingsPtr &settings)
 {
     settings->setFallbacksEnabled(fallbacksAct->isChecked());
     settingsTree->setSettingsObject(settings);
@@ -209,14 +191,14 @@ void MainWindow::setSettingsObject(QSettings *settings)
     refreshAct->setEnabled(true);
     autoRefreshAct->setEnabled(true);
 
-    QString niceName = settings->fileName();
-    niceName.replace("\\", "/");
-    int pos = niceName.lastIndexOf("/");
+    QString niceName = QDir::cleanPath(settings->fileName());
+    int pos = niceName.lastIndexOf(QLatin1Char('/'));
     if (pos != -1)
         niceName.remove(0, pos + 1);
 
     if (!settings->isWritable())
         niceName = tr("%1 (read only)").arg(niceName);
 
-    setWindowTitle(tr("%1 - %2").arg(niceName).arg(tr("Settings Editor")));
+    setWindowTitle(tr("%1 - %2").arg(niceName, QCoreApplication::applicationName()));
+    statusBar()->showMessage(tr("Opened \"%1\"").arg(QDir::toNativeSeparators(settings->fileName())));
 }
diff --git a/examples/widgets/tools/settingseditor/mainwindow.h b/examples/widgets/tools/settingseditor/mainwindow.h
index 55180c3771..4b1a28dfba 100644
--- a/examples/widgets/tools/settingseditor/mainwindow.h
+++ b/examples/widgets/tools/settingseditor/mainwindow.h
@@ -42,10 +42,10 @@
 #define MAINWINDOW_H
 
 #include <QMainWindow>
+#include <QSharedPointer>
 
 QT_BEGIN_NAMESPACE
 class QAction;
-class QMenu;
 class QSettings;
 QT_END_NAMESPACE
 class LocationDialog;
@@ -56,6 +56,8 @@ class MainWindow : public QMainWindow
     Q_OBJECT
 
 public:
+    typedef QSharedPointer<QSettings> SettingsPtr;
+
     MainWindow();
 
 private slots:
@@ -67,25 +69,13 @@ private slots:
 
 private:
     void createActions();
-    void createMenus();
-    void setSettingsObject(QSettings *settings);
+    void setSettingsObject(const SettingsPtr &settings);
 
     SettingsTree *settingsTree;
     LocationDialog *locationDialog;
-
-    QMenu *fileMenu;
-    QMenu *optionsMenu;
-    QMenu *helpMenu;
-    QAction *openSettingsAct;
-    QAction *openIniFileAct;
-    QAction *openPropertyListAct;
-    QAction *openRegistryPathAct;
     QAction *refreshAct;
-    QAction *exitAct;
     QAction *autoRefreshAct;
     QAction *fallbacksAct;
-    QAction *aboutAct;
-    QAction *aboutQtAct;
 };
 
 #endif
diff --git a/examples/widgets/tools/settingseditor/settingstree.cpp b/examples/widgets/tools/settingseditor/settingstree.cpp
index d9d53968ef..b75e3bdc54 100644
--- a/examples/widgets/tools/settingseditor/settingstree.cpp
+++ b/examples/widgets/tools/settingseditor/settingstree.cpp
@@ -45,18 +45,18 @@
 
 SettingsTree::SettingsTree(QWidget *parent)
     : QTreeWidget(parent)
+    , autoRefresh(false)
 {
     setItemDelegate(new VariantDelegate(this));
 
     QStringList labels;
     labels << tr("Setting") << tr("Type") << tr("Value");
     setHeaderLabels(labels);
-    header()->setSectionResizeMode(0, QHeaderView::Stretch);
+    header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
+    header()->setSectionResizeMode(1, QHeaderView::ResizeToContents);
     header()->setSectionResizeMode(2, QHeaderView::Stretch);
 
-    settings = 0;
     refreshTimer.setInterval(2000);
-    autoRefresh = false;
 
     groupIcon.addPixmap(style()->standardPixmap(QStyle::SP_DirClosedIcon),
                         QIcon::Normal, QIcon::Off);
@@ -64,34 +64,37 @@ SettingsTree::SettingsTree(QWidget *parent)
                         QIcon::Normal, QIcon::On);
     keyIcon.addPixmap(style()->standardPixmap(QStyle::SP_FileIcon));
 
-    connect(&refreshTimer, SIGNAL(timeout()), this, SLOT(maybeRefresh()));
+    connect(&refreshTimer, &QTimer::timeout, this, &SettingsTree::maybeRefresh);
 }
 
-void SettingsTree::setSettingsObject(QSettings *settings)
+SettingsTree::~SettingsTree()
 {
-    delete this->settings;
-    this->settings = settings;
+}
+
+void SettingsTree::setSettingsObject(const SettingsPtr &newSettings)
+{
+    settings = newSettings;
     clear();
 
-    if (settings) {
-        settings->setParent(this);
+    if (settings.isNull()) {
+        refreshTimer.stop();
+    } else {
         refresh();
         if (autoRefresh)
             refreshTimer.start();
-    } else {
-        refreshTimer.stop();
     }
 }
 
 QSize SettingsTree::sizeHint() const
 {
-    return QSize(800, 600);
+    const QRect availableGeometry = QApplication::desktop()->availableGeometry(this);
+    return QSize(availableGeometry.width() * 2 / 3, availableGeometry.height() * 2 / 3);
 }
 
 void SettingsTree::setAutoRefresh(bool autoRefresh)
 {
     this->autoRefresh = autoRefresh;
-    if (settings) {
+    if (!settings.isNull()) {
         if (autoRefresh) {
             maybeRefresh();
             refreshTimer.start();
@@ -103,7 +106,7 @@ void SettingsTree::setAutoRefresh(bool autoRefresh)
 
 void SettingsTree::setFallbacksEnabled(bool enabled)
 {
-    if (settings) {
+    if (!settings.isNull()) {
         settings->setFallbacksEnabled(enabled);
         refresh();
     }
@@ -117,17 +120,17 @@ void SettingsTree::maybeRefresh()
 
 void SettingsTree::refresh()
 {
-    if (!settings)
+    if (settings.isNull())
         return;
 
-    disconnect(this, SIGNAL(itemChanged(QTreeWidgetItem*,int)),
-               this, SLOT(updateSetting(QTreeWidgetItem*)));
+    disconnect(this, &QTreeWidget::itemChanged,
+               this, &SettingsTree::updateSetting);
 
     settings->sync();
     updateChildItems(0);
 
-    connect(this, SIGNAL(itemChanged(QTreeWidgetItem*,int)),
-            this, SLOT(updateSetting(QTreeWidgetItem*)));
+    connect(this, &QTreeWidget::itemChanged,
+            this, &SettingsTree::updateSetting);
 }
 
 bool SettingsTree::event(QEvent *event)
@@ -144,7 +147,7 @@ void SettingsTree::updateSetting(QTreeWidgetItem *item)
     QString key = item->text(0);
     QTreeWidgetItem *ancestor = item->parent();
     while (ancestor) {
-        key.prepend(ancestor->text(0) + "/");
+        key.prepend(ancestor->text(0) + QLatin1Char('/'));
         ancestor = ancestor->parent();
     }
 
@@ -162,8 +165,8 @@ void SettingsTree::updateChildItems(QTreeWidgetItem *parent)
         int childIndex = findChild(parent, group, dividerIndex);
         if (childIndex != -1) {
             child = childAt(parent, childIndex);
-            child->setText(1, "");
-            child->setText(2, "");
+            child->setText(1, QString());
+            child->setText(2, QString());
             child->setData(2, Qt::UserRole, QVariant());
             moveItemForward(parent, childIndex, dividerIndex);
         } else {
@@ -177,7 +180,7 @@ void SettingsTree::updateChildItems(QTreeWidgetItem *parent)
         settings->endGroup();
     }
 
-    foreach (QString key, settings->childKeys()) {
+    foreach (const QString &key, settings->childKeys()) {
         QTreeWidgetItem *child;
         int childIndex = findChild(parent, key, 0);
 
diff --git a/examples/widgets/tools/settingseditor/settingstree.h b/examples/widgets/tools/settingseditor/settingstree.h
index 2a64a5a496..4f542d2543 100644
--- a/examples/widgets/tools/settingseditor/settingstree.h
+++ b/examples/widgets/tools/settingseditor/settingstree.h
@@ -44,6 +44,7 @@
 #include <QIcon>
 #include <QTimer>
 #include <QTreeWidget>
+#include <QSharedPointer>
 
 QT_BEGIN_NAMESPACE
 class QSettings;
@@ -54,9 +55,12 @@ class SettingsTree : public QTreeWidget
     Q_OBJECT
 
 public:
+    typedef QSharedPointer<QSettings> SettingsPtr;
+
     SettingsTree(QWidget *parent = 0);
+    ~SettingsTree();
 
-    void setSettingsObject(QSettings *settings);
+    void setSettingsObject(const SettingsPtr &settings);
     QSize sizeHint() const Q_DECL_OVERRIDE;
 
 public slots:
@@ -80,7 +84,7 @@ private:
     int findChild(QTreeWidgetItem *parent, const QString &text, int startIndex);
     void moveItemForward(QTreeWidgetItem *parent, int oldIndex, int newIndex);
 
-    QSettings *settings;
+    SettingsPtr settings;
     QTimer refreshTimer;
     bool autoRefresh;
     QIcon groupIcon;
diff --git a/examples/widgets/widgets/icons/iconpreviewarea.cpp b/examples/widgets/widgets/icons/iconpreviewarea.cpp
index 0736261a02..090615e64d 100644
--- a/examples/widgets/widgets/icons/iconpreviewarea.cpp
+++ b/examples/widgets/widgets/icons/iconpreviewarea.cpp
@@ -46,33 +46,95 @@
 IconPreviewArea::IconPreviewArea(QWidget *parent)
     : QWidget(parent)
 {
-    QGridLayout *mainLayout = new QGridLayout;
-    setLayout(mainLayout);
+    QGridLayout *mainLayout = new QGridLayout(this);
 
-    stateLabels[0] = createHeaderLabel(tr("Off"));
-    stateLabels[1] = createHeaderLabel(tr("On"));
+    for (int row = 0; row < NumStates; ++row) {
+        stateLabels[row] = createHeaderLabel(IconPreviewArea::iconStateNames().at(row));
+        mainLayout->addWidget(stateLabels[row], row + 1, 0);
+    }
     Q_ASSERT(NumStates == 2);
 
-    modeLabels[0] = createHeaderLabel(tr("Normal"));
-    modeLabels[1] = createHeaderLabel(tr("Active"));
-    modeLabels[2] = createHeaderLabel(tr("Disabled"));
-    modeLabels[3] = createHeaderLabel(tr("Selected"));
+    for (int column = 0; column < NumModes; ++column) {
+        modeLabels[column] = createHeaderLabel(IconPreviewArea::iconModeNames().at(column));
+        mainLayout->addWidget(modeLabels[column], 0, column + 1);
+    }
     Q_ASSERT(NumModes == 4);
 
-    for (int j = 0; j < NumStates; ++j)
-        mainLayout->addWidget(stateLabels[j], j + 1, 0);
-
-    for (int i = 0; i < NumModes; ++i) {
-        mainLayout->addWidget(modeLabels[i], 0, i + 1);
-
-        for (int j = 0; j < NumStates; ++j) {
-            pixmapLabels[i][j] = createPixmapLabel();
-            mainLayout->addWidget(pixmapLabels[i][j], j + 1, i + 1);
+    for (int column = 0; column < NumModes; ++column) {
+        for (int row = 0; row < NumStates; ++row) {
+            pixmapLabels[column][row] = createPixmapLabel();
+            mainLayout->addWidget(pixmapLabels[column][row], row + 1, column + 1);
         }
     }
 }
 //! [0]
 
+#ifdef Q_COMPILER_INITIALIZER_LISTS
+
+//! [42]
+QVector<QIcon::Mode> IconPreviewArea::iconModes()
+{
+    static const QVector<QIcon::Mode> result = {QIcon::Normal, QIcon::Active, QIcon::Disabled, QIcon::Selected};
+    return result;
+}
+
+QVector<QIcon::State> IconPreviewArea::iconStates()
+{
+    static const QVector<QIcon::State> result = {QIcon::Off, QIcon::On};
+    return result;
+}
+
+QStringList IconPreviewArea::iconModeNames()
+{
+    static const QStringList result = {tr("Normal"), tr("Active"), tr("Disabled"), tr("Selected")};
+    return result;
+}
+
+QStringList IconPreviewArea::iconStateNames()
+{
+    static const QStringList result = {tr("Off"), tr("On")};
+    return result;
+}
+//! [42]
+
+#else // Q_COMPILER_INITIALIZER_LISTS
+
+//! [43]
+QVector<QIcon::Mode> IconPreviewArea::iconModes()
+{
+    static QVector<QIcon::Mode> result;
+    if (result.isEmpty())
+        result << QIcon::Normal << QIcon::Active << QIcon::Disabled << QIcon::Selected;
+    return result;
+}
+//! [43]
+
+QVector<QIcon::State> IconPreviewArea::iconStates()
+{
+    static QVector<QIcon::State> result;
+    if (result.isEmpty())
+        result << QIcon::Off << QIcon::On;
+    return result;
+}
+
+QStringList IconPreviewArea::iconModeNames()
+{
+    static QStringList result;
+    if (result.isEmpty())
+        result << tr("Normal") << tr("Active") << tr("Disabled") << tr("Selected");
+    return result;
+}
+
+QStringList IconPreviewArea::iconStateNames()
+{
+    static QStringList result;
+    if (result.isEmpty())
+        result << tr("Off") << tr("On");
+    return result;
+}
+
+#endif // !Q_COMPILER_INITIALIZER_LISTS
+
 //! [1]
 void IconPreviewArea::setIcon(const QIcon &icon)
 {
@@ -118,23 +180,27 @@ QLabel *IconPreviewArea::createPixmapLabel()
 //! [5]
 void IconPreviewArea::updatePixmapLabels()
 {
-    for (int i = 0; i < NumModes; ++i) {
-        QIcon::Mode mode;
-        if (i == 0) {
-            mode = QIcon::Normal;
-        } else if (i == 1) {
-            mode = QIcon::Active;
-        } else if (i == 2) {
-            mode = QIcon::Disabled;
-        } else {
-            mode = QIcon::Selected;
-        }
-
-        for (int j = 0; j < NumStates; ++j) {
-            QIcon::State state = (j == 0) ? QIcon::Off : QIcon::On;
-            QPixmap pixmap = icon.pixmap(size, mode, state);
-            pixmapLabels[i][j]->setPixmap(pixmap);
-            pixmapLabels[i][j]->setEnabled(!pixmap.isNull());
+    QWindow *window = Q_NULLPTR;
+    if (const QWidget *nativeParent = nativeParentWidget())
+        window = nativeParent->windowHandle();
+    for (int column = 0; column < NumModes; ++column) {
+        for (int row = 0; row < NumStates; ++row) {
+            const QPixmap pixmap =
+                icon.pixmap(window, size, IconPreviewArea::iconModes().at(column),
+                            IconPreviewArea::iconStates().at(row));
+            QLabel *pixmapLabel = pixmapLabels[column][row];
+            pixmapLabel->setPixmap(pixmap);
+            pixmapLabel->setEnabled(!pixmap.isNull());
+            QString toolTip;
+            if (!pixmap.isNull()) {
+                const QSize actualSize = icon.actualSize(size);
+                toolTip =
+                    tr("Size: %1x%2\nActual size: %3x%4\nDevice pixel ratio: %5")
+                        .arg(size.width()).arg(size.height())
+                        .arg(actualSize.width()).arg(actualSize.height())
+                        .arg(pixmap.devicePixelRatioF());
+            }
+            pixmapLabel->setToolTip(toolTip);
         }
     }
 }
diff --git a/examples/widgets/widgets/icons/iconpreviewarea.h b/examples/widgets/widgets/icons/iconpreviewarea.h
index c2e0a7b79d..693f8811d8 100644
--- a/examples/widgets/widgets/icons/iconpreviewarea.h
+++ b/examples/widgets/widgets/icons/iconpreviewarea.h
@@ -43,6 +43,8 @@
 
 #include <QIcon>
 #include <QWidget>
+#include <QStringList>
+#include <QVector>
 
 QT_BEGIN_NAMESPACE
 class QLabel;
@@ -54,11 +56,16 @@ class IconPreviewArea : public QWidget
     Q_OBJECT
 
 public:
-    IconPreviewArea(QWidget *parent = 0);
+    explicit IconPreviewArea(QWidget *parent = Q_NULLPTR);
 
     void setIcon(const QIcon &icon);
     void setSize(const QSize &size);
 
+    static QVector<QIcon::Mode> iconModes();
+    static QVector<QIcon::State> iconStates();
+    static QStringList iconModeNames();
+    static QStringList iconStateNames();
+
 private:
     QLabel *createHeaderLabel(const QString &text);
     QLabel *createPixmapLabel();
diff --git a/examples/widgets/widgets/icons/icons.pro b/examples/widgets/widgets/icons/icons.pro
index 4312a40e95..4ee95592c8 100644
--- a/examples/widgets/widgets/icons/icons.pro
+++ b/examples/widgets/widgets/icons/icons.pro
@@ -10,6 +10,8 @@ SOURCES       = iconpreviewarea.cpp \
                 main.cpp \
                 mainwindow.cpp
 
+DEFINES += SRCDIR=\\\"$$PWD/\\\"
+
 EXAMPLE_FILES = images/*
 
 # install
diff --git a/examples/widgets/widgets/icons/iconsizespinbox.cpp b/examples/widgets/widgets/icons/iconsizespinbox.cpp
index f3796040b3..1916803eea 100644
--- a/examples/widgets/widgets/icons/iconsizespinbox.cpp
+++ b/examples/widgets/widgets/icons/iconsizespinbox.cpp
@@ -52,13 +52,13 @@ IconSizeSpinBox::IconSizeSpinBox(QWidget *parent)
 //! [1]
 int IconSizeSpinBox::valueFromText(const QString &text) const
 {
-    QRegExp regExp(tr("(\\d+)(\\s*[xx]\\s*\\d+)?"));
+    static const QRegularExpression regExp(tr("(\\d+)(\\s*[xx]\\s*\\d+)?"));
+    Q_ASSERT(regExp.isValid());
 
-    if (regExp.exactMatch(text)) {
-        return regExp.cap(1).toInt();
-    } else {
-        return 0;
-    }
+    const QRegularExpressionMatch match = regExp.match(text);
+    if (match.isValid())
+        return match.captured(1).toInt();
+    return 0;
 }
 //! [1]
 
diff --git a/examples/widgets/widgets/icons/iconsizespinbox.h b/examples/widgets/widgets/icons/iconsizespinbox.h
index 08105c771c..96b277de39 100644
--- a/examples/widgets/widgets/icons/iconsizespinbox.h
+++ b/examples/widgets/widgets/icons/iconsizespinbox.h
@@ -49,7 +49,7 @@ class IconSizeSpinBox : public QSpinBox
     Q_OBJECT
 
 public:
-    IconSizeSpinBox(QWidget *parent = 0);
+    explicit IconSizeSpinBox(QWidget *parent = Q_NULLPTR);
 
     int valueFromText(const QString &text) const Q_DECL_OVERRIDE;
     QString textFromValue(int value) const Q_DECL_OVERRIDE;
diff --git a/examples/widgets/widgets/icons/imagedelegate.cpp b/examples/widgets/widgets/icons/imagedelegate.cpp
index a6df8f3b04..7c393594ca 100644
--- a/examples/widgets/widgets/icons/imagedelegate.cpp
+++ b/examples/widgets/widgets/icons/imagedelegate.cpp
@@ -41,6 +41,7 @@
 #include <QtWidgets>
 
 #include "imagedelegate.h"
+#include "iconpreviewarea.h"
 
 //! [0]
 ImageDelegate::ImageDelegate(QObject *parent)
@@ -55,17 +56,14 @@ QWidget *ImageDelegate::createEditor(QWidget *parent,
                                      const QModelIndex &index) const
 {
     QComboBox *comboBox = new QComboBox(parent);
-    if (index.column() == 1) {
-        comboBox->addItem(tr("Normal"));
-        comboBox->addItem(tr("Active"));
-        comboBox->addItem(tr("Disabled"));
-        comboBox->addItem(tr("Selected"));
-    } else if (index.column() == 2) {
-        comboBox->addItem(tr("Off"));
-        comboBox->addItem(tr("On"));
-    }
+    if (index.column() == 1)
+        comboBox->addItems(IconPreviewArea::iconModeNames());
+    else if (index.column() == 2)
+        comboBox->addItems(IconPreviewArea::iconStateNames());
 
-    connect(comboBox, SIGNAL(activated(int)), this, SLOT(emitCommitData()));
+    typedef void (QComboBox::*QComboBoxIntSignal)(int);
+    connect(comboBox, static_cast<QComboBoxIntSignal>(&QComboBox::activated),
+            this, &ImageDelegate::emitCommitData);
 
     return comboBox;
 }
diff --git a/examples/widgets/widgets/icons/imagedelegate.h b/examples/widgets/widgets/icons/imagedelegate.h
index a828251013..ed1d8210d5 100644
--- a/examples/widgets/widgets/icons/imagedelegate.h
+++ b/examples/widgets/widgets/icons/imagedelegate.h
@@ -49,7 +49,7 @@ class ImageDelegate : public QItemDelegate
     Q_OBJECT
 
 public:
-    ImageDelegate(QObject *parent = 0);
+    explicit ImageDelegate(QObject *parent = Q_NULLPTR);
 //! [0]
 
 //! [1]
diff --git a/examples/widgets/widgets/icons/main.cpp b/examples/widgets/widgets/icons/main.cpp
index 842a474405..d6a823f1c7 100644
--- a/examples/widgets/widgets/icons/main.cpp
+++ b/examples/widgets/widgets/icons/main.cpp
@@ -39,13 +39,39 @@
 ****************************************************************************/
 
 #include <QApplication>
+#include <QCommandLineParser>
+#include <QDesktopWidget>
 
 #include "mainwindow.h"
 
+//! [45]
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
+    QCoreApplication::setApplicationName(MainWindow::tr("Icons"));
+    QCoreApplication::setApplicationVersion(QT_VERSION_STR);
+    QCommandLineParser commandLineParser;
+    commandLineParser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
+    commandLineParser.addHelpOption();
+    commandLineParser.addVersionOption();
+    QCommandLineOption noHighDpiPixmapOption("no-highdpi-pixmaps",
+                                             "Disable High DPI image loading (Qt::AA_UseHighDpiPixmaps)");
+    commandLineParser.addOption(noHighDpiPixmapOption);
+        commandLineParser.addPositionalArgument(MainWindow::tr("[file]"), MainWindow::tr("Icon file(s) to open."));
+    commandLineParser.process(QCoreApplication::arguments());
+
+    if (!commandLineParser.isSet(noHighDpiPixmapOption))
+        QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
+
     MainWindow mainWin;
+    if (!commandLineParser.positionalArguments().isEmpty())
+        mainWin.loadImages(commandLineParser.positionalArguments());
+
+    const QRect availableGeometry = QApplication::desktop()->availableGeometry(&mainWin);
+    mainWin.resize(availableGeometry.width() / 2, availableGeometry.height() * 2 / 3);
+    mainWin.move((availableGeometry.width() - mainWin.width()) / 2, (availableGeometry.height() - mainWin.height()) / 2);
+
     mainWin.show();
     return app.exec();
 }
+//! [45]
diff --git a/examples/widgets/widgets/icons/mainwindow.cpp b/examples/widgets/widgets/icons/mainwindow.cpp
index 86d18cd62a..4c76b0ee16 100644
--- a/examples/widgets/widgets/icons/mainwindow.cpp
+++ b/examples/widgets/widgets/icons/mainwindow.cpp
@@ -45,34 +45,49 @@
 #include "imagedelegate.h"
 #include "mainwindow.h"
 
+//! [40]
+enum { OtherSize = QStyle::PM_CustomBase };
+//! [40]
+
 //! [0]
 MainWindow::MainWindow()
 {
-    centralWidget = new QWidget;
+    QWidget *centralWidget = new QWidget(this);
     setCentralWidget(centralWidget);
 
-    createPreviewGroupBox();
-    createImagesGroupBox();
-    createIconSizeGroupBox();
-
     createActions();
-    createMenus();
-    createContextMenu();
 
-    QGridLayout *mainLayout = new QGridLayout;
+    QGridLayout *mainLayout = new QGridLayout(centralWidget);
+
+    QGroupBox *previewGroupBox = new QGroupBox(tr("Preview"));
+    previewArea = new IconPreviewArea(previewGroupBox);
+    QVBoxLayout *previewLayout = new QVBoxLayout(previewGroupBox);
+    previewLayout->addWidget(previewArea);
+
     mainLayout->addWidget(previewGroupBox, 0, 0, 1, 2);
-    mainLayout->addWidget(imagesGroupBox, 1, 0);
-    mainLayout->addWidget(iconSizeGroupBox, 1, 1);
-    centralWidget->setLayout(mainLayout);
+    mainLayout->addWidget(createImagesGroupBox(), 1, 0);
+    QVBoxLayout *vBox = new QVBoxLayout;
+    vBox->addWidget(createIconSizeGroupBox());
+    vBox->addWidget(createHighDpiIconSizeGroupBox());
+    vBox->addItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding));
+    mainLayout->addLayout(vBox, 1, 1);
+    createContextMenu();
 
     setWindowTitle(tr("Icons"));
     checkCurrentStyle();
-    otherRadioButton->click();
-
-    resize(minimumSizeHint());
+    sizeButtonGroup->button(OtherSize)->click();
 }
 //! [0]
 
+//! [44]
+void MainWindow::show()
+{
+    QMainWindow::show();
+    connect(windowHandle(), &QWindow::screenChanged, this, &MainWindow::screenChanged);
+    screenChanged();
+}
+//! [44]
+
 //! [1]
 void MainWindow::about()
 {
@@ -89,60 +104,62 @@ void MainWindow::changeStyle(bool checked)
     if (!checked)
         return;
 
-    QAction *action = qobject_cast<QAction *>(sender());
+    const QAction *action = qobject_cast<QAction *>(sender());
 //! [2] //! [3]
     QStyle *style = QStyleFactory::create(action->data().toString());
 //! [3] //! [4]
     Q_ASSERT(style);
     QApplication::setStyle(style);
 
-    smallRadioButton->setText(tr("Small (%1 x %1)")
-            .arg(style->pixelMetric(QStyle::PM_SmallIconSize)));
-    largeRadioButton->setText(tr("Large (%1 x %1)")
-            .arg(style->pixelMetric(QStyle::PM_LargeIconSize)));
-    toolBarRadioButton->setText(tr("Toolbars (%1 x %1)")
-            .arg(style->pixelMetric(QStyle::PM_ToolBarIconSize)));
-    listViewRadioButton->setText(tr("List views (%1 x %1)")
-            .arg(style->pixelMetric(QStyle::PM_ListViewIconSize)));
-    iconViewRadioButton->setText(tr("Icon views (%1 x %1)")
-            .arg(style->pixelMetric(QStyle::PM_IconViewIconSize)));
-    tabBarRadioButton->setText(tr("Tab bars (%1 x %1)")
-            .arg(style->pixelMetric(QStyle::PM_TabBarIconSize)));
-
-    changeSize();
+    foreach (QAbstractButton *button, sizeButtonGroup->buttons()) {
+        const QStyle::PixelMetric metric = static_cast<QStyle::PixelMetric>(sizeButtonGroup->id(button));
+        const int value = style->pixelMetric(metric);
+        switch (metric) {
+        case QStyle::PM_SmallIconSize:
+            button->setText(tr("Small (%1 x %1)").arg(value));
+            break;
+        case QStyle::PM_LargeIconSize:
+            button->setText(tr("Large (%1 x %1)").arg(value));
+            break;
+        case QStyle::PM_ToolBarIconSize:
+            button->setText(tr("Toolbars (%1 x %1)").arg(value));
+            break;
+        case QStyle::PM_ListViewIconSize:
+            button->setText(tr("List views (%1 x %1)").arg(value));
+            break;
+        case QStyle::PM_IconViewIconSize:
+            button->setText(tr("Icon views (%1 x %1)").arg(value));
+            break;
+        case QStyle::PM_TabBarIconSize:
+            button->setText(tr("Tab bars (%1 x %1)").arg(value));
+            break;
+        default:
+            break;
+        }
+    }
+
+    triggerChangeSize();
 }
 //! [4]
 
 //! [5]
-void MainWindow::changeSize(bool checked)
+void MainWindow::changeSize(int id, bool checked)
 {
     if (!checked)
         return;
 
-    int extent;
-
-    if (otherRadioButton->isChecked()) {
-        extent = otherSpinBox->value();
-    } else {
-        QStyle::PixelMetric metric;
-
-        if (smallRadioButton->isChecked()) {
-            metric = QStyle::PM_SmallIconSize;
-        } else if (largeRadioButton->isChecked()) {
-            metric = QStyle::PM_LargeIconSize;
-        } else if (toolBarRadioButton->isChecked()) {
-            metric = QStyle::PM_ToolBarIconSize;
-        } else if (listViewRadioButton->isChecked()) {
-            metric = QStyle::PM_ListViewIconSize;
-        } else if (iconViewRadioButton->isChecked()) {
-            metric = QStyle::PM_IconViewIconSize;
-        } else {
-            metric = QStyle::PM_TabBarIconSize;
-        }
-        extent = QApplication::style()->pixelMetric(metric);
-    }
+    const bool other = id == int(OtherSize);
+    const int extent = other
+        ? otherSpinBox->value()
+        : QApplication::style()->pixelMetric(static_cast<QStyle::PixelMetric>(id));
+
     previewArea->setSize(QSize(extent, extent));
-    otherSpinBox->setEnabled(otherRadioButton->isChecked());
+    otherSpinBox->setEnabled(other);
+}
+
+void MainWindow::triggerChangeSize()
+{
+    changeSize(sizeButtonGroup->checkedId(), true);
 }
 //! [5]
 
@@ -152,33 +169,21 @@ void MainWindow::changeIcon()
     QIcon icon;
 
     for (int row = 0; row < imagesTable->rowCount(); ++row) {
-        QTableWidgetItem *item0 = imagesTable->item(row, 0);
-        QTableWidgetItem *item1 = imagesTable->item(row, 1);
-        QTableWidgetItem *item2 = imagesTable->item(row, 2);
-
-        if (item0->checkState() == Qt::Checked) {
-            QIcon::Mode mode;
-            if (item1->text() == tr("Normal")) {
-                mode = QIcon::Normal;
-            } else if (item1->text() == tr("Active")) {
-                mode = QIcon::Active;
-            } else if (item1->text() == tr("Disabled")) {
-                mode = QIcon::Disabled;
-            } else {
-                mode = QIcon::Selected;
-            }
-
-            QIcon::State state;
-            if (item2->text() == tr("On")) {
-                state = QIcon::On;
-            } else {
-                state = QIcon::Off;
-//! [6] //! [7]
-            }
-//! [7]
+        const QTableWidgetItem *fileItem = imagesTable->item(row, 0);
+        const QTableWidgetItem *modeItem = imagesTable->item(row, 1);
+        const QTableWidgetItem *stateItem = imagesTable->item(row, 2);
+
+        if (fileItem->checkState() == Qt::Checked) {
+            const int modeIndex = IconPreviewArea::iconModeNames().indexOf(modeItem->text());
+            Q_ASSERT(modeIndex >= 0);
+            const int stateIndex = IconPreviewArea::iconStateNames().indexOf(stateItem->text());
+            Q_ASSERT(stateIndex >= 0);
+            const QIcon::Mode mode = IconPreviewArea::iconModes().at(modeIndex);
+            const QIcon::State state = IconPreviewArea::iconStates().at(stateIndex);
+//! [6]
 
 //! [8]
-            QString fileName = item0->data(Qt::UserRole).toString();
+            const QString fileName = fileItem->data(Qt::UserRole).toString();
             QImage image(fileName);
             if (!image.isNull())
                 icon.addPixmap(QPixmap::fromImage(image), mode, state);
@@ -193,61 +198,109 @@ void MainWindow::changeIcon()
 }
 //! [11]
 
+void MainWindow::addSampleImages()
+{
+    addImages(QLatin1String(SRCDIR) + QLatin1String("/images"));
+}
+
+void MainWindow::addOtherImages()
+{
+    static bool firstInvocation = true;
+    QString directory;
+    if (firstInvocation) {
+        firstInvocation = false;
+        directory = QStandardPaths::standardLocations(QStandardPaths::PicturesLocation).value(0, QString());
+    }
+    addImages(directory);
+}
+
 //! [12]
-void MainWindow::addImages()
+void MainWindow::addImages(const QString &directory)
 {
-    QStringList fileNames = QFileDialog::getOpenFileNames(this,
-                                    tr("Open Images"), "",
-                                    tr("Images (*.png *.xpm *.jpg);;"
-                                       "All Files (*)"));
-    if (!fileNames.isEmpty()) {
-        foreach (QString fileName, fileNames) {
-            int row = imagesTable->rowCount();
-            imagesTable->setRowCount(row + 1);
+    QFileDialog fileDialog(this, tr("Open Images"), directory);
+    QStringList mimeTypeFilters;
+    foreach (const QByteArray &mimeTypeName, QImageReader::supportedMimeTypes())
+        mimeTypeFilters.append(mimeTypeName);
+    mimeTypeFilters.sort();
+    fileDialog.setMimeTypeFilters(mimeTypeFilters);
+    fileDialog.selectMimeTypeFilter(QLatin1String("image/png"));
+    fileDialog.setAcceptMode(QFileDialog::AcceptOpen);
+    fileDialog.setFileMode(QFileDialog::ExistingFiles);
+    if (!nativeFileDialogAct->isChecked())
+        fileDialog.setOption(QFileDialog::DontUseNativeDialog);
+    if (fileDialog.exec() == QDialog::Accepted)
+        loadImages(fileDialog.selectedFiles());
 //! [12]
+}
 
+void MainWindow::loadImages(const QStringList &fileNames)
+{
+    foreach (const QString &fileName, fileNames) {
+        const int row = imagesTable->rowCount();
+        imagesTable->setRowCount(row + 1);
 //! [13]
-            QString imageName = QFileInfo(fileName).baseName();
+        const QFileInfo fileInfo(fileName);
+        const QString imageName = fileInfo.baseName();
+        const QString fileName2x = fileInfo.absolutePath()
+            + QLatin1Char('/') + imageName + QLatin1String("@2x.") + fileInfo.suffix();
+        const QFileInfo fileInfo2x(fileName2x);
+        const QImage image(fileName);
+        const QString toolTip =
+            tr("Directory: %1\nFile: %2\nFile@2x: %3\nSize: %4x%5")
+               .arg(QDir::toNativeSeparators(fileInfo.absolutePath()), fileInfo.fileName())
+               .arg(fileInfo2x.exists() ? fileInfo2x.fileName() : tr("<None>"))
+               .arg(image.width()).arg(image.height());
 //! [13] //! [14]
-            QTableWidgetItem *item0 = new QTableWidgetItem(imageName);
-            item0->setData(Qt::UserRole, fileName);
-            item0->setFlags(item0->flags() & ~Qt::ItemIsEditable);
+        QTableWidgetItem *fileItem = new QTableWidgetItem(imageName);
+        fileItem->setData(Qt::UserRole, fileName);
+        fileItem->setIcon(QPixmap::fromImage(image));
+        fileItem->setFlags((fileItem->flags() | Qt::ItemIsUserCheckable) & ~Qt::ItemIsEditable);
+        fileItem->setToolTip(toolTip);
 //! [14]
 
 //! [15]
-            QTableWidgetItem *item1 = new QTableWidgetItem(tr("Normal"));
+        QIcon::Mode mode = QIcon::Normal;
 //! [15] //! [16]
-            QTableWidgetItem *item2 = new QTableWidgetItem(tr("Off"));
-
-            if (guessModeStateAct->isChecked()) {
-                if (fileName.contains("_act")) {
-                    item1->setText(tr("Active"));
-                } else if (fileName.contains("_dis")) {
-                    item1->setText(tr("Disabled"));
-                } else if (fileName.contains("_sel")) {
-                    item1->setText(tr("Selected"));
-                }
-
-                if (fileName.contains("_on"))
-                    item2->setText(tr("On"));
+        QIcon::State state = QIcon::Off;
+        if (guessModeStateAct->isChecked()) {
+            if (imageName.contains(QLatin1String("_act"), Qt::CaseInsensitive))
+                mode = QIcon::Active;
+            else if (imageName.contains(QLatin1String("_dis"), Qt::CaseInsensitive))
+                mode = QIcon::Disabled;
+            else if (imageName.contains(QLatin1String("_sel"), Qt::CaseInsensitive))
+                mode = QIcon::Selected;
+
+            if (imageName.contains(QLatin1String("_on"), Qt::CaseInsensitive))
+                state = QIcon::On;
 //! [16] //! [17]
-            }
+        }
 //! [17]
 
 //! [18]
-            imagesTable->setItem(row, 0, item0);
+        imagesTable->setItem(row, 0, fileItem);
 //! [18] //! [19]
-            imagesTable->setItem(row, 1, item1);
-            imagesTable->setItem(row, 2, item2);
-            imagesTable->openPersistentEditor(item1);
-            imagesTable->openPersistentEditor(item2);
-
-            item0->setCheckState(Qt::Checked);
-        }
+        QTableWidgetItem *modeItem =
+            new QTableWidgetItem(IconPreviewArea::iconModeNames().at(IconPreviewArea::iconModes().indexOf(mode)));
+        modeItem->setToolTip(toolTip);
+        imagesTable->setItem(row, 1, modeItem);
+        QTableWidgetItem *stateItem =
+            new QTableWidgetItem(IconPreviewArea::iconStateNames().at(IconPreviewArea::iconStates().indexOf(state)));
+        stateItem->setToolTip(toolTip);
+        imagesTable->setItem(row, 2, stateItem);
+        imagesTable->openPersistentEditor(modeItem);
+        imagesTable->openPersistentEditor(stateItem);
+
+        fileItem->setCheckState(Qt::Checked);
     }
 }
 //! [19]
 
+void MainWindow::useHighDpiPixmapsChanged(int checkState)
+{
+    QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, checkState == Qt::Checked);
+    changeIcon();
+}
+
 //! [20]
 void MainWindow::removeAllImages()
 {
@@ -256,21 +309,10 @@ void MainWindow::removeAllImages()
 }
 //! [20]
 
-void MainWindow::createPreviewGroupBox()
-{
-    previewGroupBox = new QGroupBox(tr("Preview"));
-
-    previewArea = new IconPreviewArea;
-
-    QVBoxLayout *layout = new QVBoxLayout;
-    layout->addWidget(previewArea);
-    previewGroupBox->setLayout(layout);
-}
-
 //! [21]
-void MainWindow::createImagesGroupBox()
+QWidget *MainWindow::createImagesGroupBox()
 {
-    imagesGroupBox = new QGroupBox(tr("Images"));
+    QGroupBox *imagesGroupBox = new QGroupBox(tr("Images"));
 
     imagesTable = new QTableWidget;
     imagesTable->setSelectionMode(QAbstractItemView::NoSelection);
@@ -292,57 +334,63 @@ void MainWindow::createImagesGroupBox()
 //! [23]
 
 //! [24]
-    connect(imagesTable, SIGNAL(itemChanged(QTableWidgetItem*)),
+    connect(imagesTable, &QTableWidget::itemChanged,
 //! [24] //! [25]
-            this, SLOT(changeIcon()));
+            this, &MainWindow::changeIcon);
 
-    QVBoxLayout *layout = new QVBoxLayout;
+    QVBoxLayout *layout = new QVBoxLayout(imagesGroupBox);
     layout->addWidget(imagesTable);
-    imagesGroupBox->setLayout(layout);
+    return imagesGroupBox;
 }
 //! [25]
 
 //! [26]
-void MainWindow::createIconSizeGroupBox()
+QWidget *MainWindow::createIconSizeGroupBox()
 {
-    iconSizeGroupBox = new QGroupBox(tr("Icon Size"));
-
-    smallRadioButton = new QRadioButton;
-    largeRadioButton = new QRadioButton;
-    toolBarRadioButton = new QRadioButton;
-    listViewRadioButton = new QRadioButton;
-    iconViewRadioButton = new QRadioButton;
-    tabBarRadioButton = new QRadioButton;
-    otherRadioButton = new QRadioButton(tr("Other:"));
-
+    QGroupBox *iconSizeGroupBox = new QGroupBox(tr("Icon Size"));
+
+    sizeButtonGroup = new QButtonGroup(this);
+    sizeButtonGroup->setExclusive(true);
+
+    typedef void (QButtonGroup::*QButtonGroupIntBoolSignal)(int, bool);
+    connect(sizeButtonGroup, static_cast<QButtonGroupIntBoolSignal>(&QButtonGroup::buttonToggled),
+            this, &MainWindow::changeSize);
+
+    QRadioButton *smallRadioButton = new QRadioButton;
+    sizeButtonGroup->addButton(smallRadioButton, QStyle::PM_SmallIconSize);
+    QRadioButton *largeRadioButton = new QRadioButton;
+    sizeButtonGroup->addButton(largeRadioButton, QStyle::PM_LargeIconSize);
+    QRadioButton *toolBarRadioButton = new QRadioButton;
+    sizeButtonGroup->addButton(toolBarRadioButton, QStyle::PM_ToolBarIconSize);
+    QRadioButton *listViewRadioButton = new QRadioButton;
+    sizeButtonGroup->addButton(listViewRadioButton, QStyle::PM_ListViewIconSize);
+    QRadioButton *iconViewRadioButton = new QRadioButton;
+    sizeButtonGroup->addButton(iconViewRadioButton, QStyle::PM_IconViewIconSize);
+    QRadioButton *tabBarRadioButton = new QRadioButton;
+    sizeButtonGroup->addButton(tabBarRadioButton, QStyle::PM_TabBarIconSize);
+    QRadioButton *otherRadioButton = new QRadioButton(tr("Other:"));
+    sizeButtonGroup->addButton(otherRadioButton, OtherSize);
     otherSpinBox = new IconSizeSpinBox;
-    otherSpinBox->setRange(8, 128);
+    otherSpinBox->setRange(8, 256);
+    const QString spinBoxToolTip =
+        tr("Enter a custom size within %1..%2")
+           .arg(otherSpinBox->minimum()).arg(otherSpinBox->maximum());
     otherSpinBox->setValue(64);
+    otherSpinBox->setToolTip(spinBoxToolTip);
+    otherRadioButton->setToolTip(spinBoxToolTip);
 //! [26]
 
 //! [27]
-    connect(smallRadioButton, SIGNAL(toggled(bool)),
-            this, SLOT(changeSize(bool)));
-    connect(largeRadioButton, SIGNAL(toggled(bool)),
-            this, SLOT(changeSize(bool)));
-    connect(toolBarRadioButton, SIGNAL(toggled(bool)),
-            this, SLOT(changeSize(bool)));
-    connect(listViewRadioButton, SIGNAL(toggled(bool)),
-            this, SLOT(changeSize(bool)));
-    connect(iconViewRadioButton, SIGNAL(toggled(bool)),
-            this, SLOT(changeSize(bool)));
-    connect(tabBarRadioButton, SIGNAL(toggled(bool)),
-            this, SLOT(changeSize(bool)));
-    connect(otherRadioButton, SIGNAL(toggled(bool)),
-            this, SLOT(changeSize(bool)));
-    connect(otherSpinBox, SIGNAL(valueChanged(int)), this, SLOT(changeSize()));
+    typedef void (QSpinBox::*QSpinBoxIntSignal)(int);
+    connect(otherSpinBox, static_cast<QSpinBoxIntSignal>(&QSpinBox::valueChanged),
+            this, &MainWindow::triggerChangeSize);
 
     QHBoxLayout *otherSizeLayout = new QHBoxLayout;
     otherSizeLayout->addWidget(otherRadioButton);
     otherSizeLayout->addWidget(otherSpinBox);
     otherSizeLayout->addStretch();
 
-    QGridLayout *layout = new QGridLayout;
+    QGridLayout *layout = new QGridLayout(iconSizeGroupBox);
     layout->addWidget(smallRadioButton, 0, 0);
     layout->addWidget(largeRadioButton, 1, 0);
     layout->addWidget(toolBarRadioButton, 2, 0);
@@ -351,75 +399,99 @@ void MainWindow::createIconSizeGroupBox()
     layout->addWidget(tabBarRadioButton, 2, 1);
     layout->addLayout(otherSizeLayout, 3, 0, 1, 2);
     layout->setRowStretch(4, 1);
-    iconSizeGroupBox->setLayout(layout);
+    return iconSizeGroupBox;
 }
 //! [27]
 
+void MainWindow::screenChanged()
+{
+    devicePixelRatioLabel->setText(QString::number(devicePixelRatioF()));
+    if (const QWindow *window = windowHandle()) {
+        const QScreen *screen = window->screen();
+        const QString screenDescription =
+            tr("\"%1\" (%2x%3)").arg(screen->name())
+               .arg(screen->geometry().width()).arg(screen->geometry().height());
+        screenNameLabel->setText(screenDescription);
+    }
+    changeIcon();
+}
+
+QWidget *MainWindow::createHighDpiIconSizeGroupBox()
+{
+    QGroupBox *highDpiGroupBox = new QGroupBox(tr("High DPI Scaling"));
+    QFormLayout *layout = new QFormLayout(highDpiGroupBox);
+    devicePixelRatioLabel = new QLabel(highDpiGroupBox);
+    screenNameLabel = new QLabel(highDpiGroupBox);
+    layout->addRow(tr("Screen:"), screenNameLabel);
+    layout->addRow(tr("Device pixel ratio:"), devicePixelRatioLabel);
+    QCheckBox *highDpiPixmapsCheckBox = new QCheckBox(QLatin1String("Qt::AA_UseHighDpiPixmaps"));
+    highDpiPixmapsCheckBox->setChecked(QCoreApplication::testAttribute(Qt::AA_UseHighDpiPixmaps));
+    connect(highDpiPixmapsCheckBox, &QCheckBox::stateChanged, this, &MainWindow::useHighDpiPixmapsChanged);
+    layout->addRow(highDpiPixmapsCheckBox);
+    return highDpiGroupBox;
+}
+
 //! [28]
 void MainWindow::createActions()
 {
-    addImagesAct = new QAction(tr("&Add Images..."), this);
-    addImagesAct->setShortcut(tr("Ctrl+A"));
-    connect(addImagesAct, SIGNAL(triggered()), this, SLOT(addImages()));
+    QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
+
+    addSampleImagesAct = new QAction(tr("Add &Sample Images..."), this);
+    addSampleImagesAct->setShortcut(tr("Ctrl+A"));
+    connect(addSampleImagesAct, &QAction::triggered, this, &MainWindow::addSampleImages);
+    fileMenu->addAction(addSampleImagesAct);
+
+    addOtherImagesAct = new QAction(tr("&Add Images..."), this);
+    addOtherImagesAct->setShortcut(QKeySequence::Open);
+    connect(addOtherImagesAct, &QAction::triggered, this, &MainWindow::addOtherImages);
+    fileMenu->addAction(addOtherImagesAct);
 
     removeAllImagesAct = new QAction(tr("&Remove All Images"), this);
     removeAllImagesAct->setShortcut(tr("Ctrl+R"));
-    connect(removeAllImagesAct, SIGNAL(triggered()),
-            this, SLOT(removeAllImages()));
+    connect(removeAllImagesAct, &QAction::triggered,
+            this, &MainWindow::removeAllImages);
+    fileMenu->addAction(removeAllImagesAct);
 
-    exitAct = new QAction(tr("&Quit"), this);
+    fileMenu->addSeparator();
+
+    QAction *exitAct = fileMenu->addAction(tr("&Quit"), this, &QWidget::close);
     exitAct->setShortcuts(QKeySequence::Quit);
-    connect(exitAct, SIGNAL(triggered()), this, SLOT(close()));
+
+    QMenu *viewMenu = menuBar()->addMenu(tr("&View"));
 
     styleActionGroup = new QActionGroup(this);
-    foreach (QString styleName, QStyleFactory::keys()) {
-        QAction *action = new QAction(styleActionGroup);
-        action->setText(tr("%1 Style").arg(styleName));
+    foreach (const QString &styleName, QStyleFactory::keys()) {
+        QAction *action = new QAction(tr("%1 Style").arg(styleName), styleActionGroup);
         action->setData(styleName);
         action->setCheckable(true);
-        connect(action, SIGNAL(triggered(bool)), this, SLOT(changeStyle(bool)));
+        connect(action, &QAction::triggered, this, &MainWindow::changeStyle);
+        viewMenu->addAction(action);
     }
 
+    QMenu *settingsMenu = menuBar()->addMenu(tr("&Settings"));
+
     guessModeStateAct = new QAction(tr("&Guess Image Mode/State"), this);
     guessModeStateAct->setCheckable(true);
     guessModeStateAct->setChecked(true);
+    settingsMenu->addAction(guessModeStateAct);
 
-    aboutAct = new QAction(tr("&About"), this);
-    connect(aboutAct, SIGNAL(triggered()), this, SLOT(about()));
+    nativeFileDialogAct = new QAction(tr("&Use Native File Dialog"), this);
+    nativeFileDialogAct->setCheckable(true);
+    nativeFileDialogAct->setChecked(true);
+    settingsMenu->addAction(nativeFileDialogAct);
 
-    aboutQtAct = new QAction(tr("About &Qt"), this);
-    connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
+    QMenu *helpMenu = menuBar()->addMenu(tr("&Help"));
+    helpMenu->addAction(tr("&About"), this, &MainWindow::about);
+    helpMenu->addAction(tr("About &Qt"), qApp, &QApplication::aboutQt);
 }
 //! [28]
 
-//! [29]
-void MainWindow::createMenus()
-{
-    fileMenu = menuBar()->addMenu(tr("&File"));
-    fileMenu->addAction(addImagesAct);
-    fileMenu->addAction(removeAllImagesAct);
-    fileMenu->addSeparator();
-    fileMenu->addAction(exitAct);
-
-    viewMenu = menuBar()->addMenu(tr("&View"));
-    foreach (QAction *action, styleActionGroup->actions())
-        viewMenu->addAction(action);
-    viewMenu->addSeparator();
-    viewMenu->addAction(guessModeStateAct);
-
-    menuBar()->addSeparator();
-
-    helpMenu = menuBar()->addMenu(tr("&Help"));
-    helpMenu->addAction(aboutAct);
-    helpMenu->addAction(aboutQtAct);
-}
-//! [29]
-
 //! [30]
 void MainWindow::createContextMenu()
 {
     imagesTable->setContextMenuPolicy(Qt::ActionsContextMenu);
-    imagesTable->addAction(addImagesAct);
+    imagesTable->addAction(addSampleImagesAct);
+    imagesTable->addAction(addOtherImagesAct);
     imagesTable->addAction(removeAllImagesAct);
 }
 //! [30]
@@ -429,14 +501,13 @@ void MainWindow::checkCurrentStyle()
 {
     foreach (QAction *action, styleActionGroup->actions()) {
         QString styleName = action->data().toString();
-        QStyle *candidate = QStyleFactory::create(styleName);
-        Q_ASSERT(candidate);
+        QScopedPointer<QStyle> candidate(QStyleFactory::create(styleName));
+        Q_ASSERT(!candidate.isNull());
         if (candidate->metaObject()->className()
                 == QApplication::style()->metaObject()->className()) {
             action->trigger();
             return;
         }
-        delete candidate;
     }
 }
 //! [31]
diff --git a/examples/widgets/widgets/icons/mainwindow.h b/examples/widgets/widgets/icons/mainwindow.h
index 3628038878..207986f741 100644
--- a/examples/widgets/widgets/icons/mainwindow.h
+++ b/examples/widgets/widgets/icons/mainwindow.h
@@ -49,9 +49,10 @@
 QT_BEGIN_NAMESPACE
 class QAction;
 class QActionGroup;
-class QGroupBox;
+class QLabel;
 class QMenu;
 class QRadioButton;
+class QButtonGroup;
 class QTableWidget;
 QT_END_NAMESPACE
 class IconPreviewArea;
@@ -65,51 +66,47 @@ class MainWindow : public QMainWindow
 public:
     MainWindow();
 
+    void loadImages(const QStringList &fileNames);
+
+    void show();
+
 private slots:
     void about();
     void changeStyle(bool checked);
-    void changeSize(bool checked = true);
+    void changeSize(int, bool);
+    void triggerChangeSize();
     void changeIcon();
-    void addImages();
+    void addSampleImages();
+    void addOtherImages();
     void removeAllImages();
+    void useHighDpiPixmapsChanged(int checkState);
+    void screenChanged();
 
 private:
-    void createPreviewGroupBox();
-    void createImagesGroupBox();
-    void createIconSizeGroupBox();
+    QWidget *createImagesGroupBox();
+    QWidget *createIconSizeGroupBox();
+    QWidget *createHighDpiIconSizeGroupBox();
     void createActions();
-    void createMenus();
     void createContextMenu();
     void checkCurrentStyle();
+    void addImages(const QString &directory);
 
-    QWidget *centralWidget;
-
-    QGroupBox *previewGroupBox;
     IconPreviewArea *previewArea;
 
-    QGroupBox *imagesGroupBox;
     QTableWidget *imagesTable;
 
-    QGroupBox *iconSizeGroupBox;
-    QRadioButton *smallRadioButton;
-    QRadioButton *largeRadioButton;
-    QRadioButton *toolBarRadioButton;
-    QRadioButton *listViewRadioButton;
-    QRadioButton *iconViewRadioButton;
-    QRadioButton *tabBarRadioButton;
-    QRadioButton *otherRadioButton;
+    QButtonGroup *sizeButtonGroup;
     IconSizeSpinBox *otherSpinBox;
 
-    QMenu *fileMenu;
-    QMenu *viewMenu;
-    QMenu *helpMenu;
-    QAction *addImagesAct;
+    QLabel *devicePixelRatioLabel;
+    QLabel *screenNameLabel;
+
+    QAction *addOtherImagesAct;
+    QAction *addSampleImagesAct;
     QAction *removeAllImagesAct;
-    QAction *exitAct;
     QAction *guessModeStateAct;
+    QAction *nativeFileDialogAct;
     QActionGroup *styleActionGroup;
-    QAction *aboutAct;
-    QAction *aboutQtAct;
 };
 //! [0]
 
diff --git a/examples/widgets/widgets/imageviewer/imageviewer.cpp b/examples/widgets/widgets/imageviewer/imageviewer.cpp
index 93b88e9c18..a4b37060f6 100644
--- a/examples/widgets/widgets/imageviewer/imageviewer.cpp
+++ b/examples/widgets/widgets/imageviewer/imageviewer.cpp
@@ -47,19 +47,20 @@
 
 //! [0]
 ImageViewer::ImageViewer()
+   : imageLabel(new QLabel)
+   , scrollArea(new QScrollArea)
+   , scaleFactor(1)
 {
-    imageLabel = new QLabel;
     imageLabel->setBackgroundRole(QPalette::Base);
     imageLabel->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
     imageLabel->setScaledContents(true);
 
-    scrollArea = new QScrollArea;
     scrollArea->setBackgroundRole(QPalette::Dark);
     scrollArea->setWidget(imageLabel);
+    scrollArea->setVisible(false);
     setCentralWidget(scrollArea);
 
     createActions();
-    createMenus();
 
     resize(QGuiApplication::primaryScreen()->availableSize() * 3 / 5);
 }
@@ -71,53 +72,99 @@ bool ImageViewer::loadFile(const QString &fileName)
 {
     QImageReader reader(fileName);
     reader.setAutoTransform(true);
-    const QImage image = reader.read();
-    if (image.isNull()) {
+    const QImage newImage = reader.read();
+    if (newImage.isNull()) {
         QMessageBox::information(this, QGuiApplication::applicationDisplayName(),
-                                 tr("Cannot load %1.").arg(QDir::toNativeSeparators(fileName)));
-        setWindowFilePath(QString());
-        imageLabel->setPixmap(QPixmap());
-        imageLabel->adjustSize();
+                                 tr("Cannot load %1: %2")
+                                 .arg(QDir::toNativeSeparators(fileName)), reader.errorString());
         return false;
     }
-//! [2] //! [3]
+//! [2]
+
+    setImage(newImage);
+
+    setWindowFilePath(fileName);
+
+    const QString message = tr("Opened \"%1\", %2x%3, Depth: %4")
+        .arg(QDir::toNativeSeparators(fileName)).arg(image.width()).arg(image.height()).arg(image.depth());
+    statusBar()->showMessage(message);
+    return true;
+}
+
+void ImageViewer::setImage(const QImage &newImage)
+{
+    image = newImage;
     imageLabel->setPixmap(QPixmap::fromImage(image));
-//! [3] //! [4]
+//! [4]
     scaleFactor = 1.0;
 
+    scrollArea->setVisible(true);
     printAct->setEnabled(true);
     fitToWindowAct->setEnabled(true);
     updateActions();
 
     if (!fitToWindowAct->isChecked())
         imageLabel->adjustSize();
-
-    setWindowFilePath(fileName);
-    return true;
 }
 
 //! [4]
 
-//! [2]
+bool ImageViewer::saveFile(const QString &fileName)
+{
+    QImageWriter writer(fileName);
+
+    if (!writer.write(image)) {
+        QMessageBox::information(this, QGuiApplication::applicationDisplayName(),
+                                 tr("Cannot write %1: %2")
+                                 .arg(QDir::toNativeSeparators(fileName)), writer.errorString());
+        return false;
+    }
+    const QString message = tr("Wrote \"%1\"").arg(QDir::toNativeSeparators(fileName));
+    statusBar()->showMessage(message);
+    return true;
+}
 
 //! [1]
-void ImageViewer::open()
+
+static void initializeImageFileDialog(QFileDialog &dialog, QFileDialog::AcceptMode acceptMode)
 {
+    static bool firstDialog = true;
+
+    if (firstDialog) {
+        firstDialog = false;
+        const QStringList picturesLocations = QStandardPaths::standardLocations(QStandardPaths::PicturesLocation);
+        dialog.setDirectory(picturesLocations.isEmpty() ? QDir::currentPath() : picturesLocations.last());
+    }
+
     QStringList mimeTypeFilters;
-    foreach (const QByteArray &mimeTypeName, QImageReader::supportedMimeTypes())
+    const QByteArrayList supportedMimeTypes = acceptMode == QFileDialog::AcceptOpen
+        ? QImageReader::supportedMimeTypes() : QImageWriter::supportedMimeTypes();
+    foreach (const QByteArray &mimeTypeName, supportedMimeTypes)
         mimeTypeFilters.append(mimeTypeName);
     mimeTypeFilters.sort();
-    const QStringList picturesLocations = QStandardPaths::standardLocations(QStandardPaths::PicturesLocation);
-    QFileDialog dialog(this, tr("Open File"),
-                       picturesLocations.isEmpty() ? QDir::currentPath() : picturesLocations.last());
-    dialog.setAcceptMode(QFileDialog::AcceptOpen);
     dialog.setMimeTypeFilters(mimeTypeFilters);
     dialog.selectMimeTypeFilter("image/jpeg");
+    if (acceptMode == QFileDialog::AcceptSave)
+        dialog.setDefaultSuffix("jpg");
+}
+
+void ImageViewer::open()
+{
+    QFileDialog dialog(this, tr("Open File"));
+    initializeImageFileDialog(dialog, QFileDialog::AcceptOpen);
 
     while (dialog.exec() == QDialog::Accepted && !loadFile(dialog.selectedFiles().first())) {}
 }
 //! [1]
 
+void ImageViewer::saveAs()
+{
+    QFileDialog dialog(this, tr("Save File As"));
+    initializeImageFileDialog(dialog, QFileDialog::AcceptSave);
+
+    while (dialog.exec() == QDialog::Accepted && !saveFile(dialog.selectedFiles().first())) {}
+}
+
 //! [5]
 void ImageViewer::print()
 //! [5] //! [6]
@@ -140,6 +187,43 @@ void ImageViewer::print()
 }
 //! [8]
 
+void ImageViewer::copy()
+{
+#ifndef QT_NO_CLIPBOARD
+    QGuiApplication::clipboard()->setImage(image);
+#endif // !QT_NO_CLIPBOARD
+}
+
+#ifndef QT_NO_CLIPBOARD
+static QImage clipboardImage()
+{
+    if (const QMimeData *mimeData = QGuiApplication::clipboard()->mimeData()) {
+        if (mimeData->hasImage()) {
+            const QImage image = qvariant_cast<QImage>(mimeData->imageData());
+            if (!image.isNull())
+                return image;
+        }
+    }
+    return QImage();
+}
+#endif // !QT_NO_CLIPBOARD
+
+void ImageViewer::paste()
+{
+#ifndef QT_NO_CLIPBOARD
+    const QImage newImage = clipboardImage();
+    if (newImage.isNull()) {
+        statusBar()->showMessage(tr("No image in clipboard"));
+    } else {
+        setImage(newImage);
+        setWindowFilePath(QString());
+        const QString message = tr("Obtained image from clipboard, %1x%2, Depth: %3")
+            .arg(newImage.width()).arg(newImage.height()).arg(newImage.depth());
+        statusBar()->showMessage(message);
+    }
+#endif // !QT_NO_CLIPBOARD
+}
+
 //! [9]
 void ImageViewer::zoomIn()
 //! [9] //! [10]
@@ -167,9 +251,8 @@ void ImageViewer::fitToWindow()
 {
     bool fitToWindow = fitToWindowAct->isChecked();
     scrollArea->setWidgetResizable(fitToWindow);
-    if (!fitToWindow) {
+    if (!fitToWindow)
         normalSize();
-    }
     updateActions();
 }
 //! [14]
@@ -199,79 +282,66 @@ void ImageViewer::about()
 void ImageViewer::createActions()
 //! [17] //! [18]
 {
-    openAct = new QAction(tr("&Open..."), this);
-    openAct->setShortcut(tr("Ctrl+O"));
-    connect(openAct, SIGNAL(triggered()), this, SLOT(open()));
+    QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
+
+    QAction *openAct = fileMenu->addAction(tr("&Open..."), this, &ImageViewer::open);
+    openAct->setShortcut(QKeySequence::Open);
+
+    saveAsAct = fileMenu->addAction(tr("&Save As..."), this, &ImageViewer::saveAs);
+    saveAsAct->setEnabled(false);
 
-    printAct = new QAction(tr("&Print..."), this);
-    printAct->setShortcut(tr("Ctrl+P"));
+    printAct = fileMenu->addAction(tr("&Print..."), this, &ImageViewer::print);
+    printAct->setShortcut(QKeySequence::Print);
     printAct->setEnabled(false);
-    connect(printAct, SIGNAL(triggered()), this, SLOT(print()));
 
-    exitAct = new QAction(tr("E&xit"), this);
+    fileMenu->addSeparator();
+
+    QAction *exitAct = fileMenu->addAction(tr("E&xit"), this, &QWidget::close);
     exitAct->setShortcut(tr("Ctrl+Q"));
-    connect(exitAct, SIGNAL(triggered()), this, SLOT(close()));
 
-    zoomInAct = new QAction(tr("Zoom &In (25%)"), this);
-    zoomInAct->setShortcut(tr("Ctrl++"));
+    QMenu *editMenu = menuBar()->addMenu(tr("&Edit"));
+
+    copyAct = editMenu->addAction(tr("&Copy"), this, &ImageViewer::copy);
+    copyAct->setShortcut(QKeySequence::Copy);
+    copyAct->setEnabled(false);
+
+    QAction *pasteAct = editMenu->addAction(tr("&Paste"), this, &ImageViewer::paste);
+    pasteAct->setShortcut(QKeySequence::Paste);
+
+    QMenu *viewMenu = menuBar()->addMenu(tr("&View"));
+
+    zoomInAct = viewMenu->addAction(tr("Zoom &In (25%)"), this, &ImageViewer::zoomIn);
+    zoomInAct->setShortcut(QKeySequence::ZoomIn);
     zoomInAct->setEnabled(false);
-    connect(zoomInAct, SIGNAL(triggered()), this, SLOT(zoomIn()));
 
-    zoomOutAct = new QAction(tr("Zoom &Out (25%)"), this);
-    zoomOutAct->setShortcut(tr("Ctrl+-"));
+    zoomOutAct = viewMenu->addAction(tr("Zoom &Out (25%)"), this, &ImageViewer::zoomOut);
+    zoomOutAct->setShortcut(QKeySequence::ZoomOut);
     zoomOutAct->setEnabled(false);
-    connect(zoomOutAct, SIGNAL(triggered()), this, SLOT(zoomOut()));
 
-    normalSizeAct = new QAction(tr("&Normal Size"), this);
+    normalSizeAct = viewMenu->addAction(tr("&Normal Size"), this, &ImageViewer::normalSize);
     normalSizeAct->setShortcut(tr("Ctrl+S"));
     normalSizeAct->setEnabled(false);
-    connect(normalSizeAct, SIGNAL(triggered()), this, SLOT(normalSize()));
 
-    fitToWindowAct = new QAction(tr("&Fit to Window"), this);
+    viewMenu->addSeparator();
+
+    fitToWindowAct = viewMenu->addAction(tr("&Fit to Window"), this, &ImageViewer::fitToWindow);
     fitToWindowAct->setEnabled(false);
     fitToWindowAct->setCheckable(true);
     fitToWindowAct->setShortcut(tr("Ctrl+F"));
-    connect(fitToWindowAct, SIGNAL(triggered()), this, SLOT(fitToWindow()));
 
-    aboutAct = new QAction(tr("&About"), this);
-    connect(aboutAct, SIGNAL(triggered()), this, SLOT(about()));
+    QMenu *helpMenu = menuBar()->addMenu(tr("&Help"));
 
-    aboutQtAct = new QAction(tr("About &Qt"), this);
-    connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
+    helpMenu->addAction(tr("&About"), this, &ImageViewer::about);
+    helpMenu->addAction(tr("About &Qt"), &QApplication::aboutQt);
 }
 //! [18]
 
-//! [19]
-void ImageViewer::createMenus()
-//! [19] //! [20]
-{
-    fileMenu = new QMenu(tr("&File"), this);
-    fileMenu->addAction(openAct);
-    fileMenu->addAction(printAct);
-    fileMenu->addSeparator();
-    fileMenu->addAction(exitAct);
-
-    viewMenu = new QMenu(tr("&View"), this);
-    viewMenu->addAction(zoomInAct);
-    viewMenu->addAction(zoomOutAct);
-    viewMenu->addAction(normalSizeAct);
-    viewMenu->addSeparator();
-    viewMenu->addAction(fitToWindowAct);
-
-    helpMenu = new QMenu(tr("&Help"), this);
-    helpMenu->addAction(aboutAct);
-    helpMenu->addAction(aboutQtAct);
-
-    menuBar()->addMenu(fileMenu);
-    menuBar()->addMenu(viewMenu);
-    menuBar()->addMenu(helpMenu);
-}
-//! [20]
-
 //! [21]
 void ImageViewer::updateActions()
 //! [21] //! [22]
 {
+    saveAsAct->setEnabled(!image.isNull());
+    copyAct->setEnabled(!image.isNull());
     zoomInAct->setEnabled(!fitToWindowAct->isChecked());
     zoomOutAct->setEnabled(!fitToWindowAct->isChecked());
     normalSizeAct->setEnabled(!fitToWindowAct->isChecked());
diff --git a/examples/widgets/widgets/imageviewer/imageviewer.h b/examples/widgets/widgets/imageviewer/imageviewer.h
index 7b35e3ee9e..7084bf98d1 100644
--- a/examples/widgets/widgets/imageviewer/imageviewer.h
+++ b/examples/widgets/widgets/imageviewer/imageviewer.h
@@ -42,6 +42,7 @@
 #define IMAGEVIEWER_H
 
 #include <QMainWindow>
+#include <QImage>
 #ifndef QT_NO_PRINTER
 #include <QPrinter>
 #endif
@@ -65,7 +66,10 @@ public:
 
 private slots:
     void open();
+    void saveAs();
     void print();
+    void copy();
+    void paste();
     void zoomIn();
     void zoomOut();
     void normalSize();
@@ -76,9 +80,12 @@ private:
     void createActions();
     void createMenus();
     void updateActions();
+    bool saveFile(const QString &fileName);
+    void setImage(const QImage &newImage);
     void scaleImage(double factor);
     void adjustScrollBar(QScrollBar *scrollBar, double factor);
 
+    QImage image;
     QLabel *imageLabel;
     QScrollArea *scrollArea;
     double scaleFactor;
@@ -87,19 +94,13 @@ private:
     QPrinter printer;
 #endif
 
-    QAction *openAct;
+    QAction *saveAsAct;
     QAction *printAct;
-    QAction *exitAct;
+    QAction *copyAct;
     QAction *zoomInAct;
     QAction *zoomOutAct;
     QAction *normalSizeAct;
     QAction *fitToWindowAct;
-    QAction *aboutAct;
-    QAction *aboutQtAct;
-
-    QMenu *fileMenu;
-    QMenu *viewMenu;
-    QMenu *helpMenu;
 };
 //! [0]
author	Liang Qi <liang.qi@theqtcompany.com>	2015-09-25 14:02:04 +0200
committer	Liang Qi <liang.qi@theqtcompany.com>	2015-09-25 14:02:04 +0200
commit	a1ad9a74ebb3c556c5f70f7e03be68b09598ac53 (patch)
tree	615a96db418219a57a745a5899e39a9ac90744ec /examples/widgets
parent	6d78b7a0c46ea04f4bb771d960e2f7dff1362341 (diff)
parent	462f355e4fb16cc7a1838fa2dda0f763eee58c84 (diff)