diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-03-31 07:59:20 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-03-31 07:59:20 (GMT) |
| commit | 2d0dd40702fe2be32b41efa915e6e71c310c45f1 (patch) | |
| tree | 42fa20cf37516569c6934bd754f4fd6f6878a06e /demos | |
| parent | f910b7cc12301e72b67fb85328cac878c2ad9994 (diff) | |
| parent | 97902c7f81228fa669acc6e075681dc05b404b1a (diff) | |
| download | Qt-2d0dd40702fe2be32b41efa915e6e71c310c45f1.zip Qt-2d0dd40702fe2be32b41efa915e6e71c310c45f1.tar.gz Qt-2d0dd40702fe2be32b41efa915e6e71c310c45f1.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/spectrum/spectrum.pri | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/demos/spectrum/spectrum.pri b/demos/spectrum/spectrum.pri index 5773900..75c0113 100644 --- a/demos/spectrum/spectrum.pri +++ b/demos/spectrum/spectrum.pri @@ -41,9 +41,9 @@ win32 { # ..$${spectrum_build_dir} # without the result having a trailing slash where spectrum_build_dir # is undefined. - spectrum_build_dir = /release - if (!debug_and_release|build_pass): CONFIG(debug, debug|release) { - spectrum_build_dir = /debug + build_pass { + CONFIG(release, release|debug): spectrum_build_dir = /release + CONFIG(debug, release|debug): spectrum_build_dir = /debug } } |