diff options
| author | Valentin Fokin <fokinv@inf.u-szeged.hu> | 2018-07-19 15:48:43 +0200 |
|---|---|---|
| committer | Zakor Tamas <ztamas@inf.u-szeged.hu> | 2018-08-24 13:45:02 +0000 |
| commit | 556907404d9abca53917fc63b2e716987059a2ff (patch) | |
| tree | 96d52bbcd36aec23f04e08ddb899665c564895a7 /tools | |
| parent | 444d645706d1f0cf287f8f8fc7aa90eb3482a8ea (diff) | |
Fix feature dependencies of qmlscene and qmleasing tools
Add missing guard for header include in qmlscene and skip build of
qmleasing on disabled feature.
This fixes build with -no-feature-action configuration.
Change-Id: I3b0f248e57495bbbd9a0250300f2e3ca82a01a72
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlscene/main.cpp | 4 | ||||
| -rw-r--r-- | tools/tools.pro | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index fab3dcce67..1372bd3751 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -51,8 +51,10 @@ #ifdef QT_WIDGETS_LIB #include <QtWidgets/QApplication> +#if QT_CONFIG(filedialog) #include <QtWidgets/QFileDialog> -#endif +#endif // QT_CONFIG(filedialog) +#endif // QT_WIDGETS_LIB #include <QtCore/QTranslator> #include <QtCore/QLibraryInfo> diff --git a/tools/tools.pro b/tools/tools.pro index 22544d60d3..779b656198 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -28,7 +28,13 @@ qtConfig(qml-devtools) { qmlplugindump } } - qtHaveModule(widgets): SUBDIRS += qmleasing + qtHaveModule(widgets) { + QT_FOR_CONFIG += widgets + qtConfig(dialogbuttonbox) { + SUBDIRS += \ + qmleasing + } + } } qtHaveModule(qmltest): SUBDIRS += qmltestrunner qtConfig(private_tests): SUBDIRS += qmljs |