diff options
| author | Martin Smith <martin.smith@nokia.com> | 2011-04-01 11:04:00 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2011-04-01 11:04:00 (GMT) |
| commit | c49a91a9629122f01df285a0b436c7502abc769c (patch) | |
| tree | 446c027aa379b00d3a6b673a4ad5c5600fe2408b /demos/spectrum/spectrum.pri | |
| parent | 131f429e43a5c382ae208af39bc5f889c39dee8b (diff) | |
| parent | 85d854855548497d95bef70af4d650af931a26ac (diff) | |
| download | Qt-c49a91a9629122f01df285a0b436c7502abc769c.zip Qt-c49a91a9629122f01df285a0b436c7502abc769c.tar.gz Qt-c49a91a9629122f01df285a0b436c7502abc769c.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'demos/spectrum/spectrum.pri')
| -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 } } |