diff options
| author | aavit <qt-info@nokia.com> | 2010-02-08 10:10:57 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-02-08 10:10:57 (GMT) |
| commit | dd1a2ad2eb40afd29d418cdf54544d110d39dc25 (patch) | |
| tree | 2d17f5a85f6bc38e1dd80d3ea09800aff0af29b0 /qmake/option.cpp | |
| parent | 76bcd00f74b0977b5f6ce12295aae987ea9ad4c1 (diff) | |
| parent | fd30747b5b54a760ca280ad1e75ce87026478f5e (diff) | |
| download | Qt-dd1a2ad2eb40afd29d418cdf54544d110d39dc25.zip Qt-dd1a2ad2eb40afd29d418cdf54544d110d39dc25.tar.gz Qt-dd1a2ad2eb40afd29d418cdf54544d110d39dc25.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'qmake/option.cpp')
| -rw-r--r-- | qmake/option.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp index 4eb14e2..5e06721 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -644,8 +644,8 @@ Option::fixString(QString string, uchar flags) string = string.replace('/', Option::dir_sep).replace('\\', Option::dir_sep); } - if (string.startsWith("\"") && string.endsWith("\"") || - string.startsWith("\'") && string.endsWith("\'")) + if ((string.startsWith("\"") && string.endsWith("\"")) || + (string.startsWith("\'") && string.endsWith("\'"))) string = string.mid(1, string.length()-2); //cache |