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

Conflicts:
	tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp

Change-Id: If089d5010d15c33b3c1f13912d4386207456c1a9

dist/changes-5.9.4

@@ -0,0 +1,183 @@
+Qt 5.9.4 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.9.0 through 5.9.3.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                               Qt 5.9.4 Changes                           *
+****************************************************************************
+
+QtCore
+------
+
+ - [QTBUG-64529] Fixed a compilation issue with qfloat16 if AVX2 support is
+   enabled in the compiler. Since all processors that support AVX2 also
+   support F16C, for GCC and Clang it is recommended to either add -mf16c
+   to your build or to use the corresponding -march= switch.
+
+ - QCoreApplication:
+   * [QTBUG-58919] Fixed a crash if QCoreApplication is recreated on Windows
+     and the passed argv parameter is different.
+
+ - QFileInfo:
+   * [QTBUG-30148] Fixed isWritable() on Windows to return whether the given
+     file is writable only under current privilege levels. Previously, the
+     result would take into account privilege elevation.
+
+ - QObject:
+   * Fixed a crash that could happen if the context QObject pointer passed to
+     new-style connect() was null.
+
+ - QStandardPaths:
+   * On Windows, it is now possible to resolve configuration paths even
+     without QCoreApplication created.
+
+ - QString:
+   * QString::unicode(), constData() and `data() const` do not return a
+     NUL-terminated string. This was true before, but the documentation
+     claimed the opposite.
+
+ - QVector:
+   * Fixed a problem when calling removeAll() on an element from the
+     container, if the container had more than one copy of the that element.
+
+ - QXmlStreamWriter:
+   * [QTBUG-63538] Empty namespace URIs are now possible.
+
+ - State Machine:
+   * [QTBUG-61463] Fixed a failed assertion that could happen when emitting a
+     signal from another thread.
+
+QtNetwork
+---------
+
+ - QUdpSocket:
+   * [QTBUG-64718] Fixed a regression from Qt 5.9.3 caused by an apparent
+     Win32 API quirk we triggered when using readDatagram(), resulting in
+     an invalid QHostAddress sender address. receiveDatagram() was not
+     affected.
+
+QtPrintSupport
+--------------
+
+ - QPrintDialog:
+   * [QTBUG-63933] Properly pre-select explicitly requested printer on
+     Unix.
+
+QtWidgets
+---------
+
+ - QFileSystemModel:
+   * [QTBUG-46684] It is now possible to enable per-file watching by
+     setting the environment variable QT_FILESYSTEMMODEL_WATCH_FILES,
+     allowing to track for example changes in file size.
+   * [QTBUG-64098] Fixed column alignment issues.
+   * [QTBUG-62841] Fixed assert when monitoring directories.
+
+- QPixmapCache:
+   * [QTBUG-65475] Changing application palette runtime will now affect
+     (and invalidate) cached widget pixmaps used by the current style.
+
+- QTreeView:
+   * [QTBUG-57538] Fixed issue with drag and drop sometimes being inaccurate.
+   * [QTBUG-63396] Fixed issue with child indicator not drawn correctly in RTL mode.
+   * [QTBUG-63869] Fixed key navigation issue when using hidden items.
+   * [QTBUG-8376]  Fixed row heights being wrong because of hidden columns.
+
+- QTableView:
+   * [QTBUG-60219] Fixed grid lines being drawn outside header.
+
+- QHeaderView:
+   * [QTBUG-53221] Fixed assert in QHeaderView because of layout changes.
+   * [QTBUG-65017] Fixed a font issue when using drag and drop.
+   * [QTBUG-56520] Fixed drawing issues in RTL mode.
+   * [QTBUG-41124] [QTBUG-54610] Fixed update issues.
+
+- QWidget:
+   * [QTBUG-61213] Fixed crash related to the usage of Qt::WA_WindowPropagation.
+
+- QPlainTextEdit:
+   * [QTBUG-62818] Fixed QPlainTextedit hanging because of scrollbar usage.
+
+- QMenu:
+   * [QTBUG-63576] Fixed HiDPI issue in QFusionStyle for QCheckBoxes in QMenus.
+   * [QTBUG-59794] Fixed HiDPI issue in QMenu when using several screens.
+
+- QMenuItem:
+   * [QTBUG-64055] Fixed drawing issue when setting a font style.
+
+- QAbstractButton:
+   * [QTBUG-53244] Fixed issue with released signal not being emmited when using
+     several mouse buttons at the same time.
+
+- QGraphicsEffect:
+   * [QTBUG-60231] Fixed crash when using child widgets with graphic effects.
+
+Third-Party Code
+----------------
+
+ - [QTBUG-65138] Fixed glitch in attribution documentation for Freetype
+   licenses / Qt Gui.
+
+Platform Specific Changes
+-------------------------
+
+ - eglfs:
+   * [QTBUG-65119] Fixed crash when using cursors and multiple GL contexts.
+
+ - iOS/tvOS:
+   * Qt will now take the safe area margins of the device into account when
+     computing layouts for QtWidgets.
+
+ - macOS:
+   * [QTBUG-57487][QTBUG-54160] If you have changed the button mapping of
+     your Wacom tablet in System Preferences, it will be respected by Qt
+     applications now. To revert to the old behavior, set the environment
+     variable QT_MAC_TABLET_IGNORE_BUTTON_MAPPING.
+
+ - macOS/iOS:
+   * [QTBUG-63476] Fixed an issue where text using one of the system theme
+     fonts would under certain circumstances display random glyphs.
+
+ - INTEGRITY:
+   * Added mkspec for INTEGRITY Qualcomm s820 MSM8996AU
+
+ - QNX:
+   * [QTBUG-64033] Fixed a build issue when using slog2 in QNX7.
+
+ - X11 / XCB:
+   * [QTBUG-62224] Minimal libXi version requirement has been updated from
+     1.7.4 to 1.7.5. This is because XIAllowTouchEvents is known to
+     deadlock with libXi 1.7.4 and earlier. When touch events are never
+     received, this is not an issue. Plain mouse / keyboard systems are not
+     affected.
+
+configure & build system
+------------------------
+
+ - [QTBUG-61431][QTBUG-62521] Fixed processing of *_LIBS_{DEBUG|RELEASE}=
+   configure command line arguments.
+ - [QTBUG-63452] Fixed bogus complaints about DUMMY platform when
+   re-configuring a build on a different day than initially configuring it.
+ - Fixed logic errors in the conditions of various Qt features.
+
+qmake
+-----
+
+ - [QTBUG-41246][QTBUG-50896][Xcode] It is now possible to enable generation
+   of dSYM debug symbols for release builds.
+ - [iOS] Fixed compilation of asset catalogs for a generic simulator.

examples/corelib/ipc/sharedmemory/sharedmemory.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(filedialog))
 
 SOURCES += main.cpp \
            dialog.cpp 

examples/corelib/mimetypes/mimetypebrowser/mimetypebrowser.pro

@@ -1,5 +1,6 @@
 TEMPLATE = app
 QT += widgets
+requires(qtConfig(treeview))
 CONFIG -= app_bundle
 CONFIG += c++11
 

examples/corelib/threads/queuedcustomtype/queuedcustomtype.pro

@@ -6,6 +6,7 @@ SOURCES   = main.cpp \
             renderthread.cpp \
             window.cpp
 QT += widgets
+requires(qtConfig(filedialog))
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/corelib/threads/queuedcustomtype

examples/corelib/tools/contiguouscache/contiguouscache.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(listview))
 
 HEADERS       = randomlistmodel.h
 SOURCES       = randomlistmodel.cpp \

examples/network/bearermonitor/bearermonitor.pro

@@ -1,5 +1,6 @@
 TARGET = bearermonitor
 QT = core gui network widgets
+requires(qtConfig(treeview))
 
 HEADERS = sessionwidget.h \
           bearermonitor.h

examples/network/fortuneclient/fortuneclient.pro

@@ -1,4 +1,5 @@
 QT += network widgets
+requires(qtConfig(combobox))
 
 HEADERS       = client.h
 SOURCES       = client.cpp \

examples/network/googlesuggest/googlesuggest.pro

@@ -1,4 +1,5 @@
 QT      +=  network widgets
+requires(qtConfig(itemviews))
 SOURCES =   main.cpp searchbox.cpp googlesuggest.cpp
 HEADERS  =  searchbox.h googlesuggest.h
 

examples/network/network-chat/network-chat.pro

@@ -12,6 +12,7 @@ SOURCES       = chatdialog.cpp \
 FORMS         = chatdialog.ui
 QT           += network widgets
 requires(qtConfig(udpsocket))
+requires(qtConfig(listwidget))
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/network/network-chat

examples/network/securesocketclient/securesocketclient.pro

@@ -10,6 +10,8 @@ FORMS     += certificateinfo.ui \
              sslclient.ui \
              sslerrors.ui
 QT        += network widgets
+requires(qtConfig(listwidget))
+requires(qtConfig(combobox))
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/network/securesocketclient

examples/network/torrent/torrent.pro

@@ -1,4 +1,5 @@
 QT += network widgets
+requires(qtConfig(filedialog))
 
 HEADERS += addtorrentdialog.h \
            bencodeparser.h \

examples/opengl/contextinfo/contextinfo.pro

@@ -1,5 +1,6 @@
 TEMPLATE = app
 QT += widgets
+requires(qtConfig(filedialog))
 
 SOURCES += main.cpp \
            widget.cpp \

examples/qtconcurrent/imagescaling/imagescaling.pro

@@ -1,4 +1,5 @@
 QT += concurrent widgets
+requires(qtConfig(filedialog))
 
 SOURCES += main.cpp imagescaling.cpp
 HEADERS += imagescaling.h

examples/sql/books/books.pro

@@ -7,6 +7,7 @@ SOURCES     = bookdelegate.cpp main.cpp bookwindow.cpp
 FORMS       = bookwindow.ui
 
 QT += sql widgets widgets
+requires(qtConfig(tableview))
 
 target.path = $$[QT_INSTALL_EXAMPLES]/sql/books
 INSTALLS += target

examples/sql/cachedtable/cachedtable.pro

@@ -3,6 +3,7 @@ HEADERS       = ../connection.h \
 SOURCES       = main.cpp \
                 tableeditor.cpp
 QT           += sql widgets
+requires(qtConfig(tableview))
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/sql/cachedtable

examples/sql/drilldown/drilldown.pro

@@ -8,6 +8,7 @@ SOURCES = imageitem.cpp \
           main.cpp \
           view.cpp
 QT += sql widgets
+requires(qtConfig(combobox))
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/sql/drilldown

examples/sql/masterdetail/masterdetail.pro

@@ -8,6 +8,7 @@ SOURCES   = dialog.cpp \
 
 QT += sql widgets
 QT += xml widgets
+requires(qtConfig(tableview))
 
 EXAMPLE_FILES = albumdetails.xml
 

examples/sql/querymodel/querymodel.pro

@@ -5,6 +5,7 @@ SOURCES       = customsqlmodel.cpp \
                 editablesqlmodel.cpp \
                 main.cpp
 QT           += sql widgets
+requires(qtConfig(tableview))
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/sql/querymodel

examples/sql/relationaltablemodel/relationaltablemodel.pro

@@ -1,6 +1,7 @@
 HEADERS       = ../connection.h
 SOURCES       = relationaltablemodel.cpp
 QT           += sql widgets
+requires(qtConfig(tableview))
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/sql/relationaltablemodel

examples/sql/sqlbrowser/sqlbrowser.pro

@@ -2,6 +2,7 @@ TEMPLATE        = app
 TARGET          = sqlbrowser
 
 QT              += sql widgets
+requires(qtConfig(tableview))
 
 HEADERS         = browser.h connectionwidget.h qsqlconnectiondialog.h
 SOURCES         = main.cpp browser.cpp connectionwidget.cpp qsqlconnectiondialog.cpp

examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro

@@ -2,6 +2,7 @@ HEADERS   = window.h
 SOURCES   = main.cpp \
             window.cpp
 QT += sql widgets
+requires(qtConfig(combobox))
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/sql/sqlwidgetmapper

examples/sql/tablemodel/tablemodel.pro

@@ -1,6 +1,7 @@
 HEADERS       = ../connection.h
 SOURCES       = tablemodel.cpp
 QT           += sql widgets
+requires(qtConfig(tableview))
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/sql/tablemodel

examples/touch/fingerpaint/fingerpaint.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(filedialog))
 qtHaveModule(printsupport): QT += printsupport
 
 HEADERS       = mainwindow.h \

examples/widgets/animation/animatedtiles/main.cpp

@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
+#include <QtWidgets/QtWidgets>
 #include <QtCore/qmath.h>
 #include <QtCore/qrandom.h>
 #include <QtCore/qstate.h>
@@ -236,25 +236,25 @@ int main(int argc, char **argv)
         anim->setEasingCurve(QEasingCurve::InOutBack);
         group->addAnimation(anim);
     }
-    QAbstractTransition *trans = rootState->addTransition(ellipseButton, SIGNAL(pressed()), ellipseState);
+    QAbstractTransition *trans = rootState->addTransition(ellipseButton, &Button::pressed, ellipseState);
     trans->addAnimation(group);
 
-    trans = rootState->addTransition(figure8Button, SIGNAL(pressed()), figure8State);
+    trans = rootState->addTransition(figure8Button, &Button::pressed, figure8State);
     trans->addAnimation(group);
 
-    trans = rootState->addTransition(randomButton, SIGNAL(pressed()), randomState);
+    trans = rootState->addTransition(randomButton, &Button::pressed, randomState);
     trans->addAnimation(group);
 
-    trans = rootState->addTransition(tiledButton, SIGNAL(pressed()), tiledState);
+    trans = rootState->addTransition(tiledButton, &Button::pressed, tiledState);
     trans->addAnimation(group);
 
-    trans = rootState->addTransition(centeredButton, SIGNAL(pressed()), centeredState);
+    trans = rootState->addTransition(centeredButton, &Button::pressed, centeredState);
     trans->addAnimation(group);
 
     QTimer timer;
     timer.start(125);
     timer.setSingleShot(true);
-    trans = rootState->addTransition(&timer, SIGNAL(timeout()), ellipseState);
+    trans = rootState->addTransition(&timer, &QTimer::timeout, ellipseState);
     trans->addAnimation(group);
 
     states.start();

examples/widgets/animation/easing/easing.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(listwidget))
 
 HEADERS = window.h \
           animation.h

examples/widgets/desktop/screenshot/screenshot.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(filedialog))
 
 HEADERS             = screenshot.h
 SOURCES             = main.cpp \

examples/widgets/desktop/systray/systray.pro

@@ -4,6 +4,7 @@ SOURCES       = main.cpp \
 RESOURCES     = systray.qrc
 
 QT += widgets
+requires(qtConfig(combobox))
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/desktop/systray

examples/widgets/dialogs/findfiles/findfiles.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(filedialog))
 
 HEADERS       = window.h
 SOURCES       = main.cpp \

examples/widgets/dialogs/standarddialogs/standarddialogs.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(filedialog))
 
 HEADERS       = dialog.h
 SOURCES       = dialog.cpp \

examples/widgets/dialogs/tabdialog/tabdialog.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(listwidget))
 
 HEADERS       = tabdialog.h
 SOURCES       = main.cpp \

examples/widgets/doc/src/blurpicker.qdoc

@@ -32,4 +32,13 @@
     \brief Demonstrates how to apply graphical effects on items in the view
 
     \image blurpickereffect-example.png
+
+    The Blur Picker example displays a circle of application icons.
+    All icons are blurred, except the one on the bottom left side of
+    the screen, which is the one in focus.
+    Clicking anywhere on the left side of the screen moves the icon
+    circle clockwise to the next icon
+    Clicking on the right side advances the circle counterclockwise.
+
+    \sa QGraphicsBlurEffect
 */

examples/widgets/doc/src/graphicsview-anchorlayout.qdoc

@@ -35,4 +35,47 @@
     class.
 
     \image graphicsanchorlayout-example.png
+
+    The basic steps of this example are:
+    \list
+        \li Create a QGraphicsScene
+        \li Create widgets
+        \li Create a QGraphicsAnchorLayout
+        \li Create a QGraphicsWidget
+        \li Add vertical and horizontal anchors between the widgets
+        \li View the scene with a QGraphicsView object
+    \endlist
+
+    \section1 Creating a QGraphicsScene
+
+    \quotefromfile graphicsview/anchorlayout/main.cpp
+    \skipto QGraphicsScene
+    \printuntil setSceneRect
+
+    \section1 Creating Widgets
+
+    \skipto QGraphicsProxyWidget
+    \printuntil *g
+
+    \section1 Creating a Layout
+
+    \skipto QGraphicsAnchorLayout
+    \printuntil l->setSpacing
+
+    \section1 Creating a QGraphicsWidget
+
+    \skipto QGraphicsWidget
+    \printuntil setLayout(l)
+
+    \section1 Adding Anchors
+
+    \skipto vertical
+    \printuntil l->addAnchor(f, Qt::AnchorRight
+
+    \section1 Viewing the Scene with QGraphicsView
+
+    \skipto scene.addItem
+    \printuntil view.show
+
+    \sa {Simple Anchor Layout Example}
 */

examples/widgets/draganddrop/dropsite/dropsite.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(tablewidget))
 
 HEADERS = droparea.h \
           dropsitewindow.h

examples/widgets/draganddrop/puzzle/puzzle.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(filedialog))
 
 HEADERS     = mainwindow.h \
               pieceslist.h \

examples/widgets/gestures/imagegestures/imagegestures.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(filedialog))
 
 HEADERS   = imagewidget.h \
             mainwidget.h

examples/widgets/graphicsview/boxes/boxes.pro

@@ -1,4 +1,5 @@
 QT += opengl widgets
+requires(qtConfig(combobox))
 
 qtConfig(opengles.|angle|dynamicgl): error("This example requires Qt to be configured with -opengl desktop")
 

examples/widgets/graphicsview/diagramscene/diagramscene.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(fontcombobox))
 
 HEADERS	    =   mainwindow.h \
 		diagramitem.h \

examples/widgets/graphicsview/embeddeddialogs/embeddeddialogs.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(fontcombobox))
 
 SOURCES += main.cpp
 SOURCES += customproxy.cpp embeddeddialog.cpp

examples/widgets/graphicsview/padnavigator/padnavigator.pro

@@ -17,6 +17,7 @@ FORMS += \
     form.ui
 
 QT += widgets
+requires(qtConfig(treewidget))
 qtHaveModule(opengl): QT += opengl
 
 # install

examples/widgets/itemviews/addressbook/addressbook.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(listview))
 
 SOURCES   = adddialog.cpp \
             addresswidget.cpp \

examples/widgets/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(combobox))
 
 HEADERS     = window.h
 SOURCES     = main.cpp \

examples/widgets/itemviews/chart/chart.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(filedialog))
 
 HEADERS     = mainwindow.h \
               pieview.h

examples/widgets/itemviews/coloreditorfactory/coloreditorfactory.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(combobox))
 
 HEADERS	    = colorlisteditor.h \
 	      window.h

examples/widgets/itemviews/combowidgetmapper/combowidgetmapper.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(combobox))
 
 HEADERS   = window.h
 SOURCES   = main.cpp \

examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(treeview))
 
 HEADERS     = mysortfilterproxymodel.h \
               window.h \

examples/widgets/itemviews/dirview/dirview.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(treeview))
 
 SOURCES       = main.cpp
 

examples/widgets/itemviews/editabletreemodel/editabletreemodel.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(treeview))
 
 FORMS       = mainwindow.ui
 HEADERS     = mainwindow.h \

examples/widgets/itemviews/fetchmore/fetchmore.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(listview))
 
 HEADERS   = filelistmodel.h \
             window.h

examples/widgets/itemviews/frozencolumn/frozencolumn.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(tableview))
 
 HEADERS += freezetablewidget.h
 SOURCES += main.cpp freezetablewidget.cpp

examples/widgets/itemviews/interview/interview.pro

@@ -1,5 +1,6 @@
 TEMPLATE = app
 QT += widgets
+requires(qtConfig(treeview))
 
 HEADERS += model.h
 SOURCES += model.cpp main.cpp

examples/widgets/itemviews/pixelator/pixelator.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(tableview))
 qtHaveModule(printsupport): QT += printsupport
 
 HEADERS     = imagemodel.h \

examples/widgets/itemviews/puzzle/puzzle.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(listview))
 
 HEADERS     = mainwindow.h \
               piecesmodel.h \

examples/widgets/itemviews/simpledommodel/simpledommodel.pro

@@ -6,6 +6,7 @@ SOURCES     = domitem.cpp \
               main.cpp \
               mainwindow.cpp
 QT      += xml widgets
+requires(qtConfig(filedialog))
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/simpledommodel

examples/widgets/itemviews/simpletreemodel/simpletreemodel.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(treeview))
 
 HEADERS     = treeitem.h \
               treemodel.h

examples/widgets/itemviews/simplewidgetmapper/simplewidgetmapper.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(datawidgetmapper))
 
 HEADERS   = window.h
 SOURCES   = main.cpp \

examples/widgets/itemviews/spinboxdelegate/spinboxdelegate.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(tableview))
 
 HEADERS     = delegate.h
 SOURCES     = delegate.cpp \

examples/widgets/itemviews/spreadsheet/spreadsheet.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(treeview))
 qtHaveModule(printsupport): QT += printsupport
 #unix:qtHaveModule(dbus): QT += dbus widgets
 

examples/widgets/itemviews/stardelegate/stardelegate.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(tablewidget))
 
 HEADERS       = stardelegate.h \
                 stareditor.h \

examples/widgets/itemviews/storageview/storageview.pro

@@ -1,4 +1,5 @@
 QT += core gui widgets
+requires(qtConfig(treeview))
 TARGET = storageview
 TEMPLATE = app
 SOURCES += storagemodel.cpp \

examples/widgets/layouts/basiclayouts/basiclayouts.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(combobox))
 
 HEADERS     = dialog.h
 SOURCES     = dialog.cpp \

examples/widgets/layouts/dynamiclayouts/dynamiclayouts.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(combobox))
 
 HEADERS     = dialog.h
 SOURCES     = dialog.cpp \

examples/widgets/mainwindows/application/application.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(filedialog))
 
 HEADERS       = mainwindow.h
 SOURCES       = main.cpp \

examples/widgets/mainwindows/dockwidgets/dockwidgets.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(listwidget))
 qtHaveModule(printsupport): QT += printsupport
 
 HEADERS         = mainwindow.h

examples/widgets/mainwindows/mainwindow/mainwindow.pro

@@ -1,5 +1,6 @@
 TEMPLATE = app
 QT += widgets
+requires(qtConfig(combobox))
 
 HEADERS += colorswatch.h mainwindow.h toolbar.h
 SOURCES += colorswatch.cpp mainwindow.cpp toolbar.cpp main.cpp

examples/widgets/mainwindows/mdi/mdi.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(filedialog))
 
 HEADERS       = mainwindow.h \
                 mdichild.h

examples/widgets/mainwindows/sdi/sdi.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(filedialog))
 
 HEADERS       = mainwindow.h
 SOURCES       = main.cpp \

examples/widgets/painting/basicdrawing/basicdrawing.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(combobox))
 
 HEADERS       = renderarea.h \
                 window.h

examples/widgets/painting/fontsampler/fontsampler.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(combobox))
 qtHaveModule(printsupport): QT += printsupport
 
 FORMS     = mainwindowbase.ui

examples/widgets/painting/imagecomposition/imagecomposition.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(combobox))
 
 HEADERS       = imagecomposer.h
 SOURCES       = imagecomposer.cpp \

examples/widgets/painting/painterpaths/painterpaths.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(combobox))
 
 HEADERS       = renderarea.h \
                 window.h

examples/widgets/painting/transformations/transformations.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(combobox))
 
 HEADERS     = renderarea.h \
               window.h

examples/widgets/richtext/calendar/calendar.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(combobox))
 
 HEADERS     = mainwindow.h
 SOURCES     = main.cpp \

examples/widgets/richtext/orderform/orderform.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(tablewidget))
 qtHaveModule(printsupport): QT += printsupport
 
 HEADERS     = detailsdialog.h \

examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(filedialog))
 
 HEADERS         = highlighter.h \
                   mainwindow.h

examples/widgets/richtext/textedit/textedit.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(filedialog))
 qtHaveModule(printsupport): QT += printsupport
 
 TEMPLATE        = app

examples/widgets/tools/codecs/codecs.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(filedialog))
 
 HEADERS      += mainwindow.h \
                 previewform.h

examples/widgets/tools/completer/completer.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(completer))
 
 HEADERS   = fsmodel.h \
             mainwindow.h

examples/widgets/tools/customcompleter/customcompleter.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(completer))
 
 HEADERS   = mainwindow.h \
             textedit.h

examples/widgets/tools/i18n/i18n.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(listwidget))
 
 HEADERS       = languagechooser.h \
                 mainwindow.h

examples/widgets/tools/plugandpaint/plugandpaint.pro

@@ -1,3 +1,6 @@
+QT_FOR_CONFIG += widgets
+requires(qtConfig(inputdialog))
+
 TEMPLATE = subdirs
 SUBDIRS = plugins app
 

examples/widgets/tools/regexp/regexp.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(combobox))
 
 HEADERS       = regexpdialog.h
 SOURCES       = regexpdialog.cpp \

examples/widgets/tools/regularexpression/regularexpression.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(treewidget))
 
 HEADERS       = regularexpressiondialog.h
 SOURCES       = regularexpressiondialog.cpp \

examples/widgets/tools/settingseditor/settingseditor.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(tablewidget))
 
 HEADERS       = locationdialog.h \
                 mainwindow.h \

examples/widgets/tools/treemodelcompleter/treemodelcompleter.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(completer))
 
 HEADERS   = treemodelcompleter.h \
             mainwindow.h

examples/widgets/tools/undo/undo.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(undoview))
 
 SOURCES += main.cpp mainwindow.cpp commands.cpp document.cpp
 HEADERS += mainwindow.h commands.h document.h

examples/widgets/tools/undoframework/undoframework.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(undoview))
 
 HEADERS	    = commands.h \
 	      diagramitem.h \

examples/widgets/tutorials/addressbook/part6/part6.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(filedialog))
 
 SOURCES   = addressbook.cpp \
             finddialog.cpp \

examples/widgets/tutorials/addressbook/part7/part7.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(filedialog))
 
 SOURCES   = addressbook.cpp \
             finddialog.cpp \

examples/widgets/tutorials/gettingStarted/gsQt/part5/part5.pro

@@ -1,5 +1,5 @@
-
 QT += widgets
+requires(qtConfig(filedialog))
 SOURCES = main.cpp
 
 # install

examples/widgets/tutorials/modelview/1_readonly/1_readonly.pro

@@ -3,6 +3,7 @@ TARGET =   mv_readonly
 TEMPLATE = app
 
 QT += widgets
+requires(qtConfig(tableview))
 
 SOURCES += main.cpp \
            mymodel.cpp

examples/widgets/tutorials/modelview/2_formatting/2_formatting.pro

@@ -3,6 +3,7 @@ TARGET = mv_formatting
 TEMPLATE = app
 
 QT += widgets
+requires(qtConfig(tableview))
 
 SOURCES += main.cpp \
            mymodel.cpp

examples/widgets/tutorials/modelview/3_changingmodel/3_changingmodel.pro

@@ -3,6 +3,7 @@ TARGET = mv_changingmodel
 TEMPLATE = app
 
 QT += widgets
+requires(qtConfig(tableview))
 
 SOURCES += main.cpp \
            mymodel.cpp

examples/widgets/tutorials/modelview/4_headers/4_headers.pro

@@ -3,6 +3,7 @@ TARGET = mv_headers
 TEMPLATE = app
 
 QT += widgets
+requires(qtConfig(tableview))
 
 SOURCES += main.cpp  \
            mymodel.cpp

examples/widgets/tutorials/modelview/5_edit/5_edit.pro

@@ -3,6 +3,7 @@ TARGET = mv_edit
 TEMPLATE = app
 
 QT += widgets
+requires(qtConfig(tableview))
 
 SOURCES += main.cpp \
            mainwindow.cpp \

examples/widgets/tutorials/modelview/6_treeview/6_treeview.pro

@@ -1,6 +1,7 @@
 TARGET = mv_tree
 TEMPLATE = app
 QT += widgets
+requires(qtConfig(treeview))
 SOURCES += main.cpp \
     mainwindow.cpp
 HEADERS += mainwindow.h

examples/widgets/tutorials/modelview/7_selections/7_selections.pro

@@ -1,6 +1,7 @@
 TARGET = mv_selections
 TEMPLATE = app
 QT += widgets
+requires(qtConfig(treeview))
 SOURCES += main.cpp \
     mainwindow.cpp
 HEADERS += mainwindow.h 

examples/widgets/tutorials/notepad/notepad.pro

@@ -2,6 +2,7 @@ TEMPLATE = app
 TARGET = notepad
 
 QT += printsupport
+requires(qtConfig(fontdialog))
 
 SOURCES += \
     main.cpp\

examples/widgets/tutorials/widgets/nestedlayouts/nestedlayouts.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(tableview))
 
 SOURCES = main.cpp
 

examples/widgets/widgets/calendarwidget/calendarwidget.pro

@@ -1,4 +1,5 @@
 QT += widgets
+requires(qtConfig(combobox))
 
 HEADERS =   window.h
 SOURCES =   main.cpp \