diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-15 12:18:57 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-15 12:18:57 +0100 |
commit | 499c6ed78d9657fbab344d5688c3c86b606c05b1 (patch) | |
tree | 215b21e0912bb586ee361ac540fb0792a02a2e62 /examples | |
parent | f215d00f601f66c15e0d4b2951223bc6f7e3ea5e (diff) | |
parent | c5a8dc153b3d3218360184837b098ba09018d982 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I3058a6b9347d7ca2a0c04a58cb030ae5c47de415
Diffstat (limited to 'examples')
-rw-r--r-- | examples/qml/qmlextensionplugins/plugins.qmlproject | 2 | ||||
-rw-r--r-- | examples/qml/qmlextensionplugins/qmlextensionplugins.pro | 21 |
2 files changed, 17 insertions, 6 deletions
diff --git a/examples/qml/qmlextensionplugins/plugins.qmlproject b/examples/qml/qmlextensionplugins/plugins.qmlproject index 771ab45b66..c2de5f5703 100644 --- a/examples/qml/qmlextensionplugins/plugins.qmlproject +++ b/examples/qml/qmlextensionplugins/plugins.qmlproject @@ -13,4 +13,6 @@ Project { ImageFiles { directory: "." } + + importPaths: [ "imports" ] } diff --git a/examples/qml/qmlextensionplugins/qmlextensionplugins.pro b/examples/qml/qmlextensionplugins/qmlextensionplugins.pro index 40c2b396a3..c074b8d671 100644 --- a/examples/qml/qmlextensionplugins/qmlextensionplugins.pro +++ b/examples/qml/qmlextensionplugins/qmlextensionplugins.pro @@ -7,6 +7,7 @@ QML_IMPORT_MAJOR_VERSION = 1 DESTDIR = imports/$$QML_IMPORT_NAME TARGET = qmlqtimeexampleplugin +QMLTYPES_FILENAME = $$DESTDIR/plugins.qmltypes SOURCES += \ plugin.cpp \ @@ -23,14 +24,22 @@ PLUGINFILES = \ imports/$$QML_IMPORT_NAME/hour.png \ imports/$$QML_IMPORT_NAME/minute.png -pluginfiles.files += $$PLUGINFILES +target.path = $$[QT_INSTALL_EXAMPLES]/qml/qmlextensionplugins/imports/$$QML_IMPORT_NAME -qml.files = plugins.qml -qml.path += $$[QT_INSTALL_EXAMPLES]/qml/qmlextensionplugins -target.path += $$[QT_INSTALL_EXAMPLES]/qml/qmlextensionplugins/imports/$$QML_IMPORT_NAME -pluginfiles.path += $$[QT_INSTALL_EXAMPLES]/qml/qmlextensionplugins/imports/$$QML_IMPORT_NAME +pluginfiles_copy.files = $$PLUGINFILES +pluginfiles_copy.path = $$DESTDIR -INSTALLS += target qml pluginfiles +pluginfiles_install.files = $$PLUGINFILES $$OUT_PWD/$$DESTDIR/plugins.qmltypes +pluginfiles_install.path = $$[QT_INSTALL_EXAMPLES]/qml/qmlextensionplugins/imports/$$QML_IMPORT_NAME + +qml_copy.files = plugins.qml plugins.qmlproject +qml_copy.path = $$OUT_PWD + +qml_install.files = plugins.qml plugins.qmlproject +qml_install.path = $$[QT_INSTALL_EXAMPLES]/qml/qmlextensionplugins + +INSTALLS += target qml_install pluginfiles_install +COPIES += qml_copy pluginfiles_copy OTHER_FILES += $$PLUGINFILES plugins.qml |