From 1f0b3a54ffa2ab0dc0cdff1345980ea68d749d24 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 27 May 2020 11:55:05 +0200 Subject: Examples: Fix double installation of .qml files qt_example_installs.prf already generates install rules for all example sources, including content of .qrc files. Pick-to: 5.15 Fixes: QTBUG-84301 Change-Id: I3454b19849af489c5819c51867781cc97f1eb285 Reviewed-by: Joerg Bornemann --- .../qml/tutorials/extending-qml/chapter1-basics/chapter1-basics.pro | 6 +----- .../tutorials/extending-qml/chapter2-methods/chapter2-methods.pro | 6 +----- .../tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro | 6 +----- .../chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro | 6 +----- .../chapter5-listproperties/chapter5-listproperties.pro | 6 +----- 5 files changed, 5 insertions(+), 25 deletions(-) diff --git a/examples/qml/tutorials/extending-qml/chapter1-basics/chapter1-basics.pro b/examples/qml/tutorials/extending-qml/chapter1-basics/chapter1-basics.pro index 1f777d2ea8..a15ff84851 100644 --- a/examples/qml/tutorials/extending-qml/chapter1-basics/chapter1-basics.pro +++ b/examples/qml/tutorials/extending-qml/chapter1-basics/chapter1-basics.pro @@ -14,8 +14,4 @@ RESOURCES += chapter1-basics.qrc DESTPATH = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending-qml/chapter1-basics target.path = $$DESTPATH - -qml.files = *.qml -qml.path = $$DESTPATH - -INSTALLS += target qml +INSTALLS += target diff --git a/examples/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.pro b/examples/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.pro index 264f028f5c..e10daebdc5 100644 --- a/examples/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.pro +++ b/examples/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.pro @@ -12,8 +12,4 @@ RESOURCES += chapter2-methods.qrc DESTPATH = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending-qml/chapter2-methods target.path = $$DESTPATH - -qml.files = *.qml -qml.path = $$DESTPATH - -INSTALLS += target qml +INSTALLS += target diff --git a/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro b/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro index 152f17ce8c..6cc5153faf 100644 --- a/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro +++ b/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro @@ -12,8 +12,4 @@ RESOURCES += chapter3-bindings.qrc DESTPATH = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending-qml/chapter3-bindings target.path = $$DESTPATH - -qml.files = *.qml -qml.path = $$DESTPATH - -INSTALLS += target qml +INSTALLS += target diff --git a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro index e277f74676..0544e10177 100644 --- a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro +++ b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro @@ -14,8 +14,4 @@ RESOURCES += chapter4-customPropertyTypes.qrc DESTPATH = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending-qml/chapter4-customPropertyTypes target.path = $$DESTPATH - -qml.files = *.qml -qml.path = $$DESTPATH - -INSTALLS += target qml +INSTALLS += target diff --git a/examples/qml/tutorials/extending-qml/chapter5-listproperties/chapter5-listproperties.pro b/examples/qml/tutorials/extending-qml/chapter5-listproperties/chapter5-listproperties.pro index edbd3c237d..d311c87190 100644 --- a/examples/qml/tutorials/extending-qml/chapter5-listproperties/chapter5-listproperties.pro +++ b/examples/qml/tutorials/extending-qml/chapter5-listproperties/chapter5-listproperties.pro @@ -14,8 +14,4 @@ RESOURCES += chapter5-listproperties.qrc DESTPATH = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending-qml/chapter5-listproperties target.path = $$DESTPATH - -qml.files = *.qml -qml.path = $$DESTPATH - -INSTALLS += target qml +INSTALLS += target -- cgit v1.2.3