Merge "Merge remote-tracking branch 'origin/1.11'"

2 files changed, 8 insertions, 3 deletions

diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs
index ff3fc04b5..900fde759 100644
--- a/src/lib/corelib/corelib.qbs
+++ b/src/lib/corelib/corelib.qbs
@@ -497,6 +497,6 @@ QbsLibrary {
     }
     Export {
         Depends { name: "cpp" }
-        cpp.defines: product.projectFileUpdateDefines
+        cpp.defines: base.concat(product.projectFileUpdateDefines)
     }
 }
diff --git a/src/lib/corelib/language/itemreader.cpp b/src/lib/corelib/language/itemreader.cpp
index 22f4ff11c..578f194bc 100644
--- a/src/lib/corelib/language/itemreader.cpp
+++ b/src/lib/corelib/language/itemreader.cpp
@@ -50,10 +50,15 @@
 namespace qbs {
 namespace Internal {
 
-void makePathsCanonical(QStringList &paths)
+static void makePathsCanonical(QStringList &paths)
 {
-    for (QString &p : paths)
+    auto it = std::remove_if(paths.begin(), paths.end(), [](QString &p) {
         p = QFileInfo(p).canonicalFilePath();
+        return p.isEmpty();
+    });
+    auto e = paths.end();
+    if (it != e)
+        paths.erase(it, e);
 }
 
 ItemReader::ItemReader(Logger &logger) : m_visitorState(new ItemReaderVisitorState(logger))