summaryrefslogtreecommitdiffstats
path: root/demos/helper
diff options
context:
space:
mode:
authorDaniel Molkentin <daniel.molkentin@nokia.com>2011-11-22 12:48:40 (GMT)
committerDaniel Molkentin <daniel.molkentin@nokia.com>2011-11-22 13:22:58 (GMT)
commitc6b06f07d4fdd62698e91ece75acba1f2c1748cc (patch)
treeb54b5142d08274effaa1f69aa60b2f7d2fed1629 /demos/helper
parent2f4d684267f23992e656d183bde6f8c6773e5a6d (diff)
downloadQt-c6b06f07d4fdd62698e91ece75acba1f2c1748cc.zip
Qt-c6b06f07d4fdd62698e91ece75acba1f2c1748cc.tar.gz
Qt-c6b06f07d4fdd62698e91ece75acba1f2c1748cc.tar.bz2
Fix "make install" for declarative examples
Reviewed-by: Oswald Buddenhagen
Diffstat (limited to 'demos/helper')
-rw-r--r--demos/helper/helper.pro7
-rw-r--r--demos/helper/qmlapplicationviewer/qmlapplicationviewer.pri12
2 files changed, 16 insertions, 3 deletions
diff --git a/demos/helper/helper.pro b/demos/helper/helper.pro
new file mode 100644
index 0000000..03b3dcd
--- /dev/null
+++ b/demos/helper/helper.pro
@@ -0,0 +1,7 @@
+TEMPLATE = subdirs
+
+# the helpers simply need a make install target, but require no compilation
+sources.files = \
+ qmlapplicationviewer
+sources.path = $$[QT_INSTALL_DEMOS]/helper
+INSTALLS += sources
diff --git a/demos/helper/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/helper/qmlapplicationviewer/qmlapplicationviewer.pri
index 8a51c9b..6809b64 100644
--- a/demos/helper/qmlapplicationviewer/qmlapplicationviewer.pri
+++ b/demos/helper/qmlapplicationviewer/qmlapplicationviewer.pri
@@ -75,19 +75,26 @@ symbian {
} else:unix {
maemo5 {
installPrefix = /opt/$${TARGET}
+ target.path = $${installPrefix}/bin
desktopfile.files = $${TARGET}.desktop
desktopfile.path = /usr/share/applications/hildon
icon.files = $${TARGET}64.png
icon.path = /usr/share/icons/hicolor/64x64/apps
} else:!isEmpty(MEEGO_VERSION_MAJOR) {
installPrefix = /opt/$${TARGET}
+ target.path = $${installPrefix}/bin
desktopfile.files = $${TARGET}_harmattan.desktop
desktopfile.path = /usr/share/applications
icon.files = $${TARGET}80.png
icon.path = /usr/share/icons/hicolor/80x80/apps
} else { # Assumed to be a Desktop Unix
- isEmpty(desktopInstallPrefix):installPrefix = $$[QT_INSTALL_DEMOS]/$${TARGET}
- else:installPrefix = $$desktopInstallPrefix
+ installPrefix = $$desktopInstallPrefix
+ target.path = $${installPrefix}
+ sources.files = *.cpp *.h *.desktop *.png *.pro *.qml *.qmlproject *.svg
+ sources.path = $$desktopInstallPrefix
+ export(sources.files)
+ export(sources.path)
+ INSTALLS += sources
copyCommand =
for(deploymentfolder, DEPLOYMENTFOLDERS) {
source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
@@ -135,7 +142,6 @@ symbian {
INSTALLS += icon desktopfile
}
- target.path = $${installPrefix}/bin
export(target.path)
INSTALLS += target
}