diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:34:43 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:36:19 +0100 |
commit | 65a97fccc67ae7f3df1900e1419955f939a49b9f (patch) | |
tree | a8fd0e119b585123e77e3b2574f2d82a5474eb28 /examples/widgets/widgets | |
parent | 5e8bc07cb2ded1f5f74435411de666f419869514 (diff) | |
parent | 1303327a713d8f88fd9782e4f887b646d4210f68 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
Change-Id: If089d5010d15c33b3c1f13912d4386207456c1a9
Diffstat (limited to 'examples/widgets/widgets')
-rw-r--r-- | examples/widgets/widgets/calendarwidget/calendarwidget.pro | 1 | ||||
-rw-r--r-- | examples/widgets/widgets/charactermap/charactermap.pro | 1 | ||||
-rw-r--r-- | examples/widgets/widgets/elidedlabel/elidedlabel.pro | 1 | ||||
-rw-r--r-- | examples/widgets/widgets/icons/icons.pro | 1 | ||||
-rw-r--r-- | examples/widgets/widgets/imageviewer/imageviewer.pro | 1 | ||||
-rw-r--r-- | examples/widgets/widgets/lineedits/lineedits.pro | 1 | ||||
-rw-r--r-- | examples/widgets/widgets/movie/movie.pro | 1 | ||||
-rw-r--r-- | examples/widgets/widgets/scribble/scribble.pro | 1 | ||||
-rw-r--r-- | examples/widgets/widgets/sliders/sliders.pro | 1 | ||||
-rw-r--r-- | examples/widgets/widgets/spinboxes/spinboxes.pro | 1 | ||||
-rw-r--r-- | examples/widgets/widgets/styles/styles.pro | 1 | ||||
-rw-r--r-- | examples/widgets/widgets/stylesheet/stylesheet.pro | 1 | ||||
-rw-r--r-- | examples/widgets/widgets/tablet/tablet.pro | 1 | ||||
-rw-r--r-- | examples/widgets/widgets/validators/validators.pro | 1 |
14 files changed, 14 insertions, 0 deletions
diff --git a/examples/widgets/widgets/calendarwidget/calendarwidget.pro b/examples/widgets/widgets/calendarwidget/calendarwidget.pro index a60f10bf36..4d130a48a1 100644 --- a/examples/widgets/widgets/calendarwidget/calendarwidget.pro +++ b/examples/widgets/widgets/calendarwidget/calendarwidget.pro @@ -1,4 +1,5 @@ QT += widgets +requires(qtConfig(combobox)) HEADERS = window.h SOURCES = main.cpp \ diff --git a/examples/widgets/widgets/charactermap/charactermap.pro b/examples/widgets/widgets/charactermap/charactermap.pro index 0450940c22..373aabca73 100644 --- a/examples/widgets/widgets/charactermap/charactermap.pro +++ b/examples/widgets/widgets/charactermap/charactermap.pro @@ -1,4 +1,5 @@ QT += widgets +requires(qtConfig(combobox)) HEADERS = characterwidget.h \ mainwindow.h diff --git a/examples/widgets/widgets/elidedlabel/elidedlabel.pro b/examples/widgets/widgets/elidedlabel/elidedlabel.pro index 1c135ed9c3..34040c92af 100644 --- a/examples/widgets/widgets/elidedlabel/elidedlabel.pro +++ b/examples/widgets/widgets/elidedlabel/elidedlabel.pro @@ -1,6 +1,7 @@ # Nokia Qt Examples: elided label example QT += core gui widgets +requires(qtConfig(combobox)) TARGET = elidedlabel TEMPLATE = app diff --git a/examples/widgets/widgets/icons/icons.pro b/examples/widgets/widgets/icons/icons.pro index 450bdf9f8a..243ce6b092 100644 --- a/examples/widgets/widgets/icons/icons.pro +++ b/examples/widgets/widgets/icons/icons.pro @@ -1,4 +1,5 @@ QT += widgets +requires(qtConfig(combobox)) HEADERS = iconpreviewarea.h \ iconsizespinbox.h \ diff --git a/examples/widgets/widgets/imageviewer/imageviewer.pro b/examples/widgets/widgets/imageviewer/imageviewer.pro index 4903a68537..d3db63ec20 100644 --- a/examples/widgets/widgets/imageviewer/imageviewer.pro +++ b/examples/widgets/widgets/imageviewer/imageviewer.pro @@ -1,4 +1,5 @@ QT += widgets +requires(qtConfig(filedialog)) qtHaveModule(printsupport): QT += printsupport HEADERS = imageviewer.h diff --git a/examples/widgets/widgets/lineedits/lineedits.pro b/examples/widgets/widgets/lineedits/lineedits.pro index 0ab994ea11..71f0e3e681 100644 --- a/examples/widgets/widgets/lineedits/lineedits.pro +++ b/examples/widgets/widgets/lineedits/lineedits.pro @@ -1,4 +1,5 @@ QT += widgets +requires(qtConfig(combobox)) HEADERS = window.h SOURCES = main.cpp \ diff --git a/examples/widgets/widgets/movie/movie.pro b/examples/widgets/widgets/movie/movie.pro index e3b9b5129c..f9f89109e4 100644 --- a/examples/widgets/widgets/movie/movie.pro +++ b/examples/widgets/widgets/movie/movie.pro @@ -1,4 +1,5 @@ QT += widgets +requires(qtConfig(filedialog)) HEADERS = movieplayer.h SOURCES = main.cpp \ diff --git a/examples/widgets/widgets/scribble/scribble.pro b/examples/widgets/widgets/scribble/scribble.pro index aff0fb442c..56caaaf8e6 100644 --- a/examples/widgets/widgets/scribble/scribble.pro +++ b/examples/widgets/widgets/scribble/scribble.pro @@ -1,4 +1,5 @@ QT += widgets +requires(qtConfig(filedialog)) qtHaveModule(printsupport): QT += printsupport HEADERS = mainwindow.h \ diff --git a/examples/widgets/widgets/sliders/sliders.pro b/examples/widgets/widgets/sliders/sliders.pro index 40c3167eea..963331779c 100644 --- a/examples/widgets/widgets/sliders/sliders.pro +++ b/examples/widgets/widgets/sliders/sliders.pro @@ -1,4 +1,5 @@ QT += widgets +requires(qtConfig(combobox)) HEADERS = slidersgroup.h \ window.h diff --git a/examples/widgets/widgets/spinboxes/spinboxes.pro b/examples/widgets/widgets/spinboxes/spinboxes.pro index 67fc9e2d34..832c3725c5 100644 --- a/examples/widgets/widgets/spinboxes/spinboxes.pro +++ b/examples/widgets/widgets/spinboxes/spinboxes.pro @@ -1,4 +1,5 @@ QT += widgets +requires(qtConfig(datetimeedit)) HEADERS = window.h SOURCES = main.cpp \ diff --git a/examples/widgets/widgets/styles/styles.pro b/examples/widgets/widgets/styles/styles.pro index 235642f270..87dee7e04c 100644 --- a/examples/widgets/widgets/styles/styles.pro +++ b/examples/widgets/widgets/styles/styles.pro @@ -1,4 +1,5 @@ QT += widgets +requires(qtConfig(combobox)) HEADERS = norwegianwoodstyle.h \ widgetgallery.h diff --git a/examples/widgets/widgets/stylesheet/stylesheet.pro b/examples/widgets/widgets/stylesheet/stylesheet.pro index 7607006fad..0fe3187f63 100644 --- a/examples/widgets/widgets/stylesheet/stylesheet.pro +++ b/examples/widgets/widgets/stylesheet/stylesheet.pro @@ -1,4 +1,5 @@ QT += widgets +requires(qtConfig(combobox)) HEADERS = mainwindow.h \ stylesheeteditor.h diff --git a/examples/widgets/widgets/tablet/tablet.pro b/examples/widgets/widgets/tablet/tablet.pro index 9b8927f483..5772cd0385 100644 --- a/examples/widgets/widgets/tablet/tablet.pro +++ b/examples/widgets/widgets/tablet/tablet.pro @@ -1,4 +1,5 @@ QT += widgets +requires(qtConfig(filedialog)) HEADERS = mainwindow.h \ tabletcanvas.h \ diff --git a/examples/widgets/widgets/validators/validators.pro b/examples/widgets/widgets/validators/validators.pro index 68805f33d3..ab1eb7809b 100644 --- a/examples/widgets/widgets/validators/validators.pro +++ b/examples/widgets/widgets/validators/validators.pro @@ -1,4 +1,5 @@ QT += widgets +requires(qtConfig(combobox)) FORMS += validators.ui RESOURCES += validators.qrc |