diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-03-08 08:47:05 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-03-08 08:47:28 +0100 |
| commit | 9d4c518eafc6ef7ef74262ce82b4a43b52098bca (patch) | |
| tree | a9deb1e545397c3cd0313ecd58a7b50786ed72ad | |
| parent | be89648d18e857bd9848b596759e59039696d658 (diff) | |
| download | ptxdist-9d4c518eafc6ef7ef74262ce82b4a43b52098bca.tar.gz ptxdist-9d4c518eafc6ef7ef74262ce82b4a43b52098bca.tar.xz | |
qt5: fix building with QtWayland enabled and QtDeclarative disabledptxdist-2019.03.0
The QtwQtWayland QML plugins are only built when QtDeclarative is enabled,
so don't try to install them otherwise.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/qt5.in | 5 | ||||
| -rw-r--r-- | rules/qt5.make | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/rules/qt5.in b/rules/qt5.in index 91bd420f1..d7822e81c 100644 --- a/rules/qt5.in +++ b/rules/qt5.in @@ -604,6 +604,11 @@ config QT5_MODULE_QTWAYLAND_MESA depends on MESALIB && QT5_OPENGL default QT5_MODULE_QTWAYLAND +config QT5_MODULE_QTWAYLAND_QUICK + bool + depends on QT5_MODULE_QTWAYLAND + default QT5_MODULE_QTDECLARATIVE + config QT5_MODULE_QTWEBCHANNEL bool diff --git a/rules/qt5.make b/rules/qt5.make index e227d40e9..26f88aac4 100644 --- a/rules/qt5.make +++ b/rules/qt5.make @@ -557,7 +557,7 @@ QT5_PLUGINS-$(PTXCONF_QT5_MODULE_QTWAYLAND) += wayland-shell-integration/libxd QT5_PLUGINS-$(PTXCONF_QT5_MODULE_QTWAYLAND) += wayland-shell-integration/libxdg-shell QT5_PLUGINS-$(PTXCONF_QT5_MODULE_QTWAYLAND) += wayland-decoration-client/libbradient -QT5_QML-$(PTXCONF_QT5_MODULE_QTWAYLAND) += QtWayland +QT5_QML-$(PTXCONF_QT5_MODULE_QTWAYLAND_QUICK) += QtWayland ### QtWebChannel ### QT5_LIBS-$(PTXCONF_QT5_MODULE_QTWEBCHANNEL) += Qt5WebChannel |