diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index d41f9af1e8b..52d0e043cd3 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -522,9 +522,9 @@ void Qt4PriFileNode::update(ProFile *includeFileExact, ProFileReader *readerExac
                 newFilePaths += readerCumulative->absoluteFileValues(qmakeVariable, projectDir, vPathsCumulative, includeFileCumlative);
 
         }
-        newFilePaths.removeDuplicates();
 
         if (!newFilePaths.isEmpty()) {
+            newFilePaths.removeDuplicates();
             InternalNode *subfolder = new InternalNode;
             subfolder->type = type;
             subfolder->icon = fileTypes.at(i).icon;
@@ -1444,14 +1444,14 @@ QStringList Qt4ProFileNode::subDirsPaths(ProFileReader *reader) const
         }
 
         if (QFile::exists(realFile)) {
-            if (!subProjectPaths.contains(realFile))
-                subProjectPaths << realFile;
+            subProjectPaths << realFile;
         } else {
             m_project->proFileParseError(tr("Could not find .pro file for sub dir '%1' in '%2'")
                                          .arg(subDirVar).arg(realDir));
         }
     }
 
+    subProjectPaths.removeDuplicates();
     return subProjectPaths;
 }
 
diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp
index 2da92571166..c9ce082b41b 100644
--- a/src/shared/proparser/profileevaluator.cpp
+++ b/src/shared/proparser/profileevaluator.cpp
@@ -2468,7 +2468,7 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction(
 #endif
         case T_EVAL: {
                 ProBlock *pro = new ProBlock();
-                QString buf = args.join(QLatin1String(" "));
+                QString buf = args.join(statics.field_sep);
                 if (!readInternal(pro, buf, (ushort*)buf.data())) {
                     delete pro;
                     return ProItem::ReturnFalse;