diff options
| author | Daniel Molkentin <daniel.molkentin@nokia.com> | 2011-11-22 12:48:40 (GMT) |
|---|---|---|
| committer | Daniel Molkentin <daniel.molkentin@nokia.com> | 2011-11-22 13:22:58 (GMT) |
| commit | c6b06f07d4fdd62698e91ece75acba1f2c1748cc (patch) | |
| tree | b54b5142d08274effaa1f69aa60b2f7d2fed1629 /demos | |
| parent | 2f4d684267f23992e656d183bde6f8c6773e5a6d (diff) | |
| download | Qt-c6b06f07d4fdd62698e91ece75acba1f2c1748cc.zip Qt-c6b06f07d4fdd62698e91ece75acba1f2c1748cc.tar.gz Qt-c6b06f07d4fdd62698e91ece75acba1f2c1748cc.tar.bz2 | |
Fix "make install" for declarative examples
Reviewed-by: Oswald Buddenhagen
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/demos.pro | 4 | ||||
| -rw-r--r-- | demos/helper/helper.pro | 7 | ||||
| -rw-r--r-- | demos/helper/qmlapplicationviewer/qmlapplicationviewer.pri | 12 |
3 files changed, 19 insertions, 4 deletions
diff --git a/demos/demos.pro b/demos/demos.pro index ed18446..41540c6 100644 --- a/demos/demos.pro +++ b/demos/demos.pro @@ -61,7 +61,7 @@ wince*:SUBDIRS += demos_sqlbrowser } contains(QT_CONFIG, phonon):!static:SUBDIRS += demos_mediaplayer contains(QT_CONFIG, webkit):contains(QT_CONFIG, svg):!symbian:SUBDIRS += demos_browser -contains(QT_CONFIG, declarative):SUBDIRS += demos_declarative +contains(QT_CONFIG, declarative):SUBDIRS += demos_declarative demos_helper contains(QT_CONFIG, multimedia):!static:SUBDIRS += demos_spectrum # install @@ -94,6 +94,8 @@ demos_undo.subdir = undo demos_qtdemo.subdir = qtdemo demos_mediaplayer.subdir = qmediaplayer demos_declarative.subdir = declarative +demos_declarative.depends = demos_helper +demos_helper.subdir = helper #mobile demos. Requires QtMobility sources. Not included in demo build demos_guitartuner.subdir = mobile/guitartuner 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 } |