summaryrefslogtreecommitdiffstats
path: root/demos/sub-attaq/sub-attaq.pro
diff options
context:
space:
mode:
authorAndreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>2009-10-02 06:40:17 (GMT)
committerAndreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>2009-10-02 06:40:17 (GMT)
commit17dc26e3e7a65b6eb0c0980a76c8fbe7bd37c690 (patch)
treeee9a982c144fb636ec22cdf7dd27de37725ff320 /demos/sub-attaq/sub-attaq.pro
parentb148b182b5b48d60c2b57d8b74ad0f30272bb578 (diff)
parent7ea326d796a6d2ecb13b961c576c82a797d84706 (diff)
downloadQt-17dc26e3e7a65b6eb0c0980a76c8fbe7bd37c690.zip
Qt-17dc26e3e7a65b6eb0c0980a76c8fbe7bd37c690.tar.gz
Qt-17dc26e3e7a65b6eb0c0980a76c8fbe7bd37c690.tar.bz2
Merge commit 'qt-mainline/4.6' into kinetic-declarativeui
Conflicts: configure.exe
Diffstat (limited to 'demos/sub-attaq/sub-attaq.pro')
-rw-r--r--demos/sub-attaq/sub-attaq.pro4
1 files changed, 2 insertions, 2 deletions
diff --git a/demos/sub-attaq/sub-attaq.pro b/demos/sub-attaq/sub-attaq.pro
index ba2b54b..8677ff5 100644
--- a/demos/sub-attaq/sub-attaq.pro
+++ b/demos/sub-attaq/sub-attaq.pro
@@ -31,13 +31,13 @@ SOURCES += boat.cpp \
RESOURCES += subattaq.qrc
# install
-target.path = $$[QT_INSTALL_DEMOS]/animation/sub-attaq
+target.path = $$[QT_INSTALL_DEMOS]/sub-attaq
sources.files = $$SOURCES \
$$HEADERS \
$$RESOURCES \
$$FORMS \
sub-attaq.pro \
pics
-sources.path = $$[QT_INSTALL_DEMOS]/animation/sub-attaq
+sources.path = $$[QT_INSTALL_DEMOS]/sub-attaq
INSTALLS += target \
sources