diff options
| author | Bernd Weimer <bernd.weimer@pelagicore.com> | 2019-11-13 12:31:03 +0100 |
|---|---|---|
| committer | Bernd Weimer <bernd.weimer@pelagicore.com> | 2019-11-15 11:30:23 +0100 |
| commit | 70c4363dc968a19d4d9d14cb514aab4e957b56ef (patch) | |
| tree | 10cc9cf109f2551dae23e864128671ab20d74d7f /examples/applicationmanager/application-features | |
| parent | 973a514b1a5ed706b024866c715dacdff68f70ab (diff) | |
Fix installation of application-features example
Fixes build issue against Qt 5.14
Change-Id: I3a6609dfb4dc02a98bf93f8d9b22d0a898fe4a60
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Diffstat (limited to 'examples/applicationmanager/application-features')
| -rw-r--r-- | examples/applicationmanager/application-features/imports/terminator2/terminator2.pro | 13 | ||||
| -rw-r--r-- | examples/applicationmanager/application-features/native/widgets/widgets.pro | 3 |
2 files changed, 10 insertions, 6 deletions
diff --git a/examples/applicationmanager/application-features/imports/terminator2/terminator2.pro b/examples/applicationmanager/application-features/imports/terminator2/terminator2.pro index c10008d7..c68900df 100644 --- a/examples/applicationmanager/application-features/imports/terminator2/terminator2.pro +++ b/examples/applicationmanager/application-features/imports/terminator2/terminator2.pro @@ -10,9 +10,12 @@ SOURCES += qmlterminator2.cpp OTHER_FILES += qmldir DESTDIR = $$OUT_PWD/../../apps/crash/Terminator -target.path=$$DESTDIR -qmldir.files=$$PWD/qmldir -qmldir.path=$$DESTDIR -INSTALLS += target -COPIES += qmldir +qmldir_copy.files = $$PWD/qmldir +qmldir_copy.path = $$DESTDIR +COPIES += qmldir_copy + +target.path = $$[QT_INSTALL_EXAMPLES]/applicationmanager/application-features/apps/crash/Terminator +qmldir.files = $$PWD/qmldir +qmldir.path = $${target.path} +INSTALLS += target qmldir diff --git a/examples/applicationmanager/application-features/native/widgets/widgets.pro b/examples/applicationmanager/application-features/native/widgets/widgets.pro index 589c1ab1..bf5ef1d4 100644 --- a/examples/applicationmanager/application-features/native/widgets/widgets.pro +++ b/examples/applicationmanager/application-features/native/widgets/widgets.pro @@ -5,5 +5,6 @@ QT += widgets appman_launcher-private appman_common-private SOURCES = main.cpp DESTDIR = $$OUT_PWD/../../apps/widgets -target.path=$$DESTDIR + +target.path = $$[QT_INSTALL_EXAMPLES]/applicationmanager/application-features/apps/widgets INSTALLS += target |