diff options
author | Shane Kearns <shane.kearns@accenture.com> | 2010-05-26 11:28:42 (GMT) |
---|---|---|
committer | Shane Kearns <shane.kearns@accenture.com> | 2010-05-26 11:28:42 (GMT) |
commit | f2d6af86383cfd9d5344673f4c755f06b900fa46 (patch) | |
tree | a00711f73c644f59523899627d309fd8665ca07c /demos/spectrum/app/app.pro | |
parent | 70ae881499ec329e6fdf96d56a6189f77641b3b0 (diff) | |
parent | 39b861b75566c4db0db3b5aba2aa191a59f10bdb (diff) | |
download | Qt-f2d6af86383cfd9d5344673f4c755f06b900fa46.zip Qt-f2d6af86383cfd9d5344673f4c755f06b900fa46.tar.gz Qt-f2d6af86383cfd9d5344673f4c755f06b900fa46.tar.bz2 |
Merge branch '4.7' of scm.dev.troll.no:qt/qt into 4.7
Conflicts:
src/gui/kernel/qapplication_s60.cpp
Diffstat (limited to 'demos/spectrum/app/app.pro')
-rw-r--r-- | demos/spectrum/app/app.pro | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/demos/spectrum/app/app.pro b/demos/spectrum/app/app.pro index 257675c..a80ae9b 100644 --- a/demos/spectrum/app/app.pro +++ b/demos/spectrum/app/app.pro @@ -71,6 +71,13 @@ symbian { } } +# Install + +sources.files = $$SOURCES $$HEADERS $$RESOURCES app.pro +sources.path = $$[QT_INSTALL_DEMOS]/spectrum/app +images.files += images/record.png images/settings.png +images.path = $$[QT_INSTALL_DEMOS]/spectrum/app/images +INSTALLS += sources images # Deployment @@ -112,7 +119,7 @@ symbian { # the dynamic library can be located. copy_launch_script.target = copy_launch_script copy_launch_script.commands = \ - install -m 0555 $$PWD/spectrum.sh ../bin/spectrum + install -m 0555 $$QT_SOURCE_TREE/demos/spectrum/app/spectrum.sh ../bin/spectrum QMAKE_EXTRA_TARGETS += copy_launch_script POST_TARGETDEPS += copy_launch_script } |