5 files changed, 8 insertions, 19 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
index 325a8548cf..4024231b70 100644
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
@@ -30,7 +30,7 @@ QOBJS = \
 	quuid.o \
 	qarraydata.o qbitarray.o qbytearray.o qbytearraylist.o qbytearraymatcher.o \
 	qcalendar.o qgregoriancalendar.o qromancalendar.o \
-	qcryptographichash.o qdatetime.o qhash.o qlist.o \
+        qcryptographichash.o qdatetime.o qhash.o \
 	qlocale.o qlocale_tools.o qmap.o qregexp.o qringbuffer.o \
 	qstringbuilder.o qstring.o qstringlist.o qversionnumber.o \
 	qvsnprintf.o qxmlstream.o qxmlutils.o \
@@ -127,7 +127,6 @@ DEPEND_SRC = \
 	   $(SOURCE_PATH)/src/corelib/tools/qbitarray.cpp \
 	   $(SOURCE_PATH)/src/corelib/tools/qcryptographichash.cpp \
 	   $(SOURCE_PATH)/src/corelib/tools/qhash.cpp \
-	   $(SOURCE_PATH)/src/corelib/tools/qlist.cpp \
 	   $(SOURCE_PATH)/src/corelib/tools/qmap.cpp \
 	   $(SOURCE_PATH)/src/corelib/tools/qringbuffer.cpp \
 	   $(SOURCE_PATH)/src/corelib/tools/qversionnumber.cpp \
@@ -374,9 +373,6 @@ qversionnumber.o: $(SOURCE_PATH)/src/corelib/tools/qversionnumber.cpp
 qbuffer.o: $(SOURCE_PATH)/src/corelib/io/qbuffer.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) $<
 
-qlist.o: $(SOURCE_PATH)/src/corelib/tools/qlist.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $<
-
 qfile.o: $(SOURCE_PATH)/src/corelib/io/qfile.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) $<
 
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32
index 6c8d5ec922..6f27b735d4 100644
--- a/qmake/Makefile.win32
+++ b/qmake/Makefile.win32
@@ -91,7 +91,6 @@ QTOBJS= \
 	qiodevice.obj \
 	qringbuffer.obj \
 	qdebug.obj \
-	qlist.obj \
 	qlocale.obj \
 	qlocale_tools.obj \
 	qlocale_win.obj \
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/property.cpp b/qmake/property.cpp
index 432ff55664..31d6cdc9d6 100644
--- a/qmake/property.cpp
+++ b/qmake/property.cpp
@@ -54,7 +54,6 @@ static const struct {
     { "QT_INSTALL_BINS", QLibraryInfo::BinariesPath, false, false },
     { "QT_INSTALL_TESTS", QLibraryInfo::TestsPath, false, false },
     { "QT_INSTALL_PLUGINS", QLibraryInfo::PluginsPath, false, false },
-    { "QT_INSTALL_IMPORTS", QLibraryInfo::ImportsPath, false, false },
     { "QT_INSTALL_QML", QLibraryInfo::Qml2ImportsPath, false, false },
     { "QT_INSTALL_TRANSLATIONS", QLibraryInfo::TranslationsPath, false, false },
     { "QT_INSTALL_CONFIGURATION", QLibraryInfo::SettingsPath, false, false },