summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-07 12:12:31 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-07 12:12:31 (GMT)
commit53a3b44aea9d2e331b0359b23512b778b520091a (patch)
tree4516b109c97a2fe00ddc3b7e3b86b1459af44af3 /demos
parentd3527d779b784ad89285bcb8790504354d9dd3ae (diff)
parent8677cfb1cffd215403d18a4ef2ced52a8a3cf3af (diff)
downloadQt-53a3b44aea9d2e331b0359b23512b778b520091a.zip
Qt-53a3b44aea9d2e331b0359b23512b778b520091a.tar.gz
Qt-53a3b44aea9d2e331b0359b23512b778b520091a.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Make Fluidlauncher demo have same version as corresponding Qt Fix the building of sis files. Make symbian install to epocroot by default.
Diffstat (limited to 'demos')
-rw-r--r--demos/embedded/fluidlauncher/fluidlauncher.pro1
1 files changed, 1 insertions, 0 deletions
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.pro b/demos/embedded/fluidlauncher/fluidlauncher.pro
index 21f3819..416e58b 100644
--- a/demos/embedded/fluidlauncher/fluidlauncher.pro
+++ b/demos/embedded/fluidlauncher/fluidlauncher.pro
@@ -2,6 +2,7 @@ TEMPLATE = app
TARGET =
DEPENDPATH += .
INCLUDEPATH += .
+VERSION = $$QT_VERSION
# Input
HEADERS += \