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/tools | |
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/tools')
11 files changed, 13 insertions, 0 deletions
diff --git a/examples/widgets/tools/codecs/codecs.pro b/examples/widgets/tools/codecs/codecs.pro index 2bdb130268..13daa79237 100644 --- a/examples/widgets/tools/codecs/codecs.pro +++ b/examples/widgets/tools/codecs/codecs.pro @@ -1,4 +1,5 @@ QT += widgets +requires(qtConfig(filedialog)) HEADERS += mainwindow.h \ previewform.h diff --git a/examples/widgets/tools/completer/completer.pro b/examples/widgets/tools/completer/completer.pro index cbc6ec85b5..c616e08468 100644 --- a/examples/widgets/tools/completer/completer.pro +++ b/examples/widgets/tools/completer/completer.pro @@ -1,4 +1,5 @@ QT += widgets +requires(qtConfig(completer)) HEADERS = fsmodel.h \ mainwindow.h diff --git a/examples/widgets/tools/customcompleter/customcompleter.pro b/examples/widgets/tools/customcompleter/customcompleter.pro index 499fab5537..74c2ceb320 100644 --- a/examples/widgets/tools/customcompleter/customcompleter.pro +++ b/examples/widgets/tools/customcompleter/customcompleter.pro @@ -1,4 +1,5 @@ QT += widgets +requires(qtConfig(completer)) HEADERS = mainwindow.h \ textedit.h diff --git a/examples/widgets/tools/i18n/i18n.pro b/examples/widgets/tools/i18n/i18n.pro index 8bfdd07a63..a4d5e418ea 100644 --- a/examples/widgets/tools/i18n/i18n.pro +++ b/examples/widgets/tools/i18n/i18n.pro @@ -1,4 +1,5 @@ QT += widgets +requires(qtConfig(listwidget)) HEADERS = languagechooser.h \ mainwindow.h diff --git a/examples/widgets/tools/plugandpaint/plugandpaint.pro b/examples/widgets/tools/plugandpaint/plugandpaint.pro index f7da8a52bd..58c4dbbb6e 100644 --- a/examples/widgets/tools/plugandpaint/plugandpaint.pro +++ b/examples/widgets/tools/plugandpaint/plugandpaint.pro @@ -1,3 +1,6 @@ +QT_FOR_CONFIG += widgets +requires(qtConfig(inputdialog)) + TEMPLATE = subdirs SUBDIRS = plugins app diff --git a/examples/widgets/tools/regexp/regexp.pro b/examples/widgets/tools/regexp/regexp.pro index f80c16fb60..a4c2971c25 100644 --- a/examples/widgets/tools/regexp/regexp.pro +++ b/examples/widgets/tools/regexp/regexp.pro @@ -1,4 +1,5 @@ QT += widgets +requires(qtConfig(combobox)) HEADERS = regexpdialog.h SOURCES = regexpdialog.cpp \ diff --git a/examples/widgets/tools/regularexpression/regularexpression.pro b/examples/widgets/tools/regularexpression/regularexpression.pro index 8e72e171b8..cc23402b9d 100644 --- a/examples/widgets/tools/regularexpression/regularexpression.pro +++ b/examples/widgets/tools/regularexpression/regularexpression.pro @@ -1,4 +1,5 @@ QT += widgets +requires(qtConfig(treewidget)) HEADERS = regularexpressiondialog.h SOURCES = regularexpressiondialog.cpp \ diff --git a/examples/widgets/tools/settingseditor/settingseditor.pro b/examples/widgets/tools/settingseditor/settingseditor.pro index 5e605f1941..4880b7e582 100644 --- a/examples/widgets/tools/settingseditor/settingseditor.pro +++ b/examples/widgets/tools/settingseditor/settingseditor.pro @@ -1,4 +1,5 @@ QT += widgets +requires(qtConfig(tablewidget)) HEADERS = locationdialog.h \ mainwindow.h \ diff --git a/examples/widgets/tools/treemodelcompleter/treemodelcompleter.pro b/examples/widgets/tools/treemodelcompleter/treemodelcompleter.pro index 9f2b1ca9e4..ec25e0fc1c 100644 --- a/examples/widgets/tools/treemodelcompleter/treemodelcompleter.pro +++ b/examples/widgets/tools/treemodelcompleter/treemodelcompleter.pro @@ -1,4 +1,5 @@ QT += widgets +requires(qtConfig(completer)) HEADERS = treemodelcompleter.h \ mainwindow.h diff --git a/examples/widgets/tools/undo/undo.pro b/examples/widgets/tools/undo/undo.pro index 3727c8cbde..9b7b577dd3 100644 --- a/examples/widgets/tools/undo/undo.pro +++ b/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 diff --git a/examples/widgets/tools/undoframework/undoframework.pro b/examples/widgets/tools/undoframework/undoframework.pro index 5c877be338..9f7fbc3375 100644 --- a/examples/widgets/tools/undoframework/undoframework.pro +++ b/examples/widgets/tools/undoframework/undoframework.pro @@ -1,4 +1,5 @@ QT += widgets +requires(qtConfig(undoview)) HEADERS = commands.h \ diagramitem.h \ |