diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-05-24 00:49:54 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-05-24 00:49:54 (GMT) |
| commit | 7104b7598f6c8d61d008edab227cfce3ec4442fc (patch) | |
| tree | e390a009bbc0826af59b105f7d5501a3f59028a3 /demos | |
| parent | b827967fef469f66a5a2f975bfafc3cdb82c4ffb (diff) | |
| parent | cb23151d3abfdbdf291abe8a1510592db2011927 (diff) | |
| download | Qt-7104b7598f6c8d61d008edab227cfce3ec4442fc.zip Qt-7104b7598f6c8d61d008edab227cfce3ec4442fc.tar.gz Qt-7104b7598f6c8d61d008edab227cfce3ec4442fc.tar.bz2 | |
Merge remote branch 'origin/4.7' into oslo-staging-1
Conflicts:
src/gui/styles/qmacstyle_mac.mm
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/spectrum/app/app.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/spectrum/app/app.pro b/demos/spectrum/app/app.pro index 2adb605..8d7ce8e 100644 --- a/demos/spectrum/app/app.pro +++ b/demos/spectrum/app/app.pro @@ -111,7 +111,7 @@ symbian { # the dynamic library can be located. copy_launch_script.target = copy_launch_script copy_launch_script.commands = \ - install -m 0555 spectrum.sh ../bin/spectrum + install -m 0555 $$PWD/spectrum.sh ../bin/spectrum QMAKE_EXTRA_TARGETS += copy_launch_script POST_TARGETDEPS += copy_launch_script } |