diff options
Diffstat (limited to 'qmake/generators/makefiledeps.cpp')
-rw-r--r-- | qmake/generators/makefiledeps.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/qmake/generators/makefiledeps.cpp b/qmake/generators/makefiledeps.cpp index d68539814e..0ff64c4fbc 100644 --- a/qmake/generators/makefiledeps.cpp +++ b/qmake/generators/makefiledeps.cpp @@ -60,19 +60,14 @@ QT_BEGIN_NAMESPACE inline bool qmake_endOfLine(const char &c) { return (c == '\r' || c == '\n'); } #endif -QMakeLocalFileName::QMakeLocalFileName(const QString &name) : is_null(name.isNull()) +QMakeLocalFileName::QMakeLocalFileName(const QString &name) + : 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 { - if(!is_null && local_name.isNull()) + if (!isNull() && local_name.isNull()) local_name = Option::normalizePath(real_name); return local_name; } @@ -251,7 +246,7 @@ bool QMakeSourceFileInfo::mocable(const QString &file) return false; } -QMakeSourceFileInfo::QMakeSourceFileInfo(const QString &cf) +QMakeSourceFileInfo::QMakeSourceFileInfo() { //dep_mode dep_mode = Recursive; |