diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-02-04 11:40:27 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-02-04 11:40:27 (GMT) |
| commit | 7b46aa91709fd7df0ca791d63f68ee5a9436d50a (patch) | |
| tree | fd10fd74d729124d6ef4099f6fe933e3ad9fa9ab /qmake/option.cpp | |
| parent | 4cd8dd562ea149d5a6cdcc15533e4975682106f6 (diff) | |
| parent | 3569038ffec0c133ff29f80d506f334cc0f2ddb3 (diff) | |
| download | Qt-7b46aa91709fd7df0ca791d63f68ee5a9436d50a.zip Qt-7b46aa91709fd7df0ca791d63f68ee5a9436d50a.tar.gz Qt-7b46aa91709fd7df0ca791d63f68ee5a9436d50a.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
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 9577a28..5522a80 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -630,8 +630,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 |