3 files changed, 12 insertions, 17 deletions
diff --git a/qmake/generators/makefiledeps.cpp b/qmake/generators/makefiledeps.cpp
index d68539814e..7c4be64aa8 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;
 }
diff --git a/qmake/generators/makefiledeps.h b/qmake/generators/makefiledeps.h
index 66b87bf470..7e39396754 100644
--- a/qmake/generators/makefiledeps.h
+++ b/qmake/generators/makefiledeps.h
@@ -41,14 +41,14 @@ struct SourceFile;
 struct SourceDependChildren;
 class SourceFiles;
 
-class QMakeLocalFileName {
-    bool is_null;
+class QMakeLocalFileName
+{
     QString real_name;
     mutable QString local_name;
 public:
-    QMakeLocalFileName() : is_null(true) {}
+    QMakeLocalFileName() = default;
     QMakeLocalFileName(const QString &);
-    bool isNull() const { return is_null; }
+    bool isNull() const { return real_name.isNull(); }
     inline const QString &real() const { return real_name; }
     const QString &local() const;
 
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 550fa9d834..4a6a42c7d2 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -1542,14 +1542,14 @@ std::pair<bool, QString> UnixMakefileGenerator::writeObjectsPart(QTextStream &t,
                 t << "\\\n\t\t" << (*objit);
         }
         if (incrs_out.count() == objs.count()) { //we just switched places, no real incrementals to be done!
-            t << escapeFilePaths(incrs_out).join(QString(" \\\n\t\t")) << endl;
+            t << escapeFilePaths(incrs_out).join(QString(" \\\n\t\t")) << Qt::endl;
         } else if (!incrs_out.count()) {
-            t << endl;
+            t << Qt::endl;
         } else {
             src_incremental = true;
-            t << endl;
+            t << Qt::endl;
             t << "INCREMENTAL_OBJECTS = "
-              << escapeFilePaths(incrs_out).join(QString(" \\\n\t\t")) << endl;
+              << escapeFilePaths(incrs_out).join(QString(" \\\n\t\t")) << Qt::endl;
         }
     } else {
         const ProString &objMax = project->first("QMAKE_LINK_OBJECT_MAX");
@@ -1566,7 +1566,7 @@ std::pair<bool, QString> UnixMakefileGenerator::writeObjectsPart(QTextStream &t,
             createResponseFile(ld_response_file, objs);
             objectsLinkLine = "@" + escapeFilePath(ld_response_file);
         }
-        t << "OBJECTS       = " << valList(escapeDependencyPaths(objs)) << endl;
+        t << "OBJECTS       = " << valList(escapeDependencyPaths(objs)) << Qt::endl;
     }
     return std::make_pair(src_incremental, objectsLinkLine);
 }