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>
This commit is contained in:
Valentin Fokin 2018-07-19 15:48:43 +02:00 committed by Zakor Tamas
parent 444d645706
commit 556907404d
2 changed files with 10 additions and 2 deletions

View File

@ -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>

View File

@ -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