diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-11-01 12:47:08 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-11-01 13:47:37 +0100 |
| commit | 7213a0d5e5454555e44a2b1d8cdac0490c1e5ab9 (patch) | |
| tree | 801f459cb4283162f0e858372cb35041ba1f3fb0 /src/imports/qtqml/qtqml.pro | |
| parent | 893100fba3f3a2e4d4ffe108202fdac67a3d4357 (diff) | |
Generate QtQml's qmldir dynamically
We need to skip the worker script import if compiled without
qml-worker-script.
Fixes: QTBUG-79169
Change-Id: I5edbca96233ae002a464ec10f4f5bb5ab5383ef9
Reviewed-by: Nodir Temirkhodjaev <nodir.temir@gmail.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/imports/qtqml/qtqml.pro')
| -rw-r--r-- | src/imports/qtqml/qtqml.pro | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/imports/qtqml/qtqml.pro b/src/imports/qtqml/qtqml.pro index 7a5169b8fc..902f0b1247 100644 --- a/src/imports/qtqml/qtqml.pro +++ b/src/imports/qtqml/qtqml.pro @@ -9,4 +9,15 @@ SOURCES += \ # In Qt6 we won't need qmlmodels-private here QT = qml-private qmlmodels-private +DYNAMIC_QMLDIR = \ + "module QtQml" \ + "plugin qmlplugin" \ + "classname QtQmlPlugin" \ + "typeinfo plugins.qmltypes" \ + "designersupported" \ + "import QtQml.Models" + +qtConfig(qml-worker-script): DYNAMIC_QMLDIR += \ + "import QtQml.WorkerScript" + load(qml_plugin) |