diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-08-26 11:11:13 +0200 |
|---|---|---|
| committer | Jörg Bornemann <joerg.bornemann@qt.io> | 2019-08-29 14:02:48 +0000 |
| commit | ea1c8d4e65676bf49ad0ae8e4e0d390fb7be37f6 (patch) | |
| tree | 9b2741d62fdd23b6ad12c3a06758c2f0077b93c9 /qmake | |
| parent | 949482f8e43533d3370201c0f216253c7b5872bd (diff) | |
Remove nonsensical initialization from QMakeLocalFileName
The c'tor that takes a QString detects whether the string's first and
*last but one* characters are double quotes. In that case it removes
the first and *last* characters, resulting in a conversion from
"\"C:\\foo\"\\" to "C:\\foo\"". It's highly unlikely that this code path
was ever triggered, because its erroneous result would have been
noticed. Remove it.
Change-Id: I653e6a4667ae3620c35e509420eb22a71bb986a9
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefiledeps.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/qmake/generators/makefiledeps.cpp b/qmake/generators/makefiledeps.cpp index d68539814e..1b1b0426bb 100644 --- a/qmake/generators/makefiledeps.cpp +++ b/qmake/generators/makefiledeps.cpp @@ -61,13 +61,8 @@ inline bool qmake_endOfLine(const char &c) { return (c == '\r' || c == '\n'); } #endif QMakeLocalFileName::QMakeLocalFileName(const QString &name) : is_null(name.isNull()) + , real_name(name) { - if(!name.isEmpty()) { - if(name.at(0) == QLatin1Char('"') && name.at(name.length()-2) == QLatin1Char('"')) - real_name = name.mid(1, name.length()-2); - else - real_name = name; - } } const QString &QMakeLocalFileName::local() const |