diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-12 01:00:48 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-12 01:00:48 +0200 |
commit | cd14f003990194a9f5dd77f10e62cab2b7ce7d6b (patch) | |
tree | bf46b34e6c7302063e8a5ee80d5540fd5e94fb51 /src/imports | |
parent | 1fa23b42b512d90eb4c70372f9723eda16f0f330 (diff) | |
parent | 10c56615d1418c155648e2a150b45b6cb768b33e (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I50759e6601b02f87e07083a64fca23e0f4e23ca7
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/qtqml/qtqml.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/qtqml/qtqml.pro b/src/imports/qtqml/qtqml.pro index 05ef15a542..8804c944e7 100644 --- a/src/imports/qtqml/qtqml.pro +++ b/src/imports/qtqml/qtqml.pro @@ -1,5 +1,5 @@ TARGETPATH = QtQml -QML_FILES += plugins.qmltypes +AUX_QML_FILES += plugins.qmltypes load(qml_module) |