Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
	src/corelib/global/qnamespace.qdoc
	src/corelib/io/qwindowspipereader.cpp
	src/corelib/io/qwindowspipereader_p.h
	src/corelib/statemachine/qstatemachine.cpp
	src/corelib/statemachine/qstatemachine_p.h
	src/plugins/platforms/xcb/qxcbconnection.h
	tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
	tests/auto/tools/qmake/tst_qmake.cpp
	tests/manual/touch/main.cpp

Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62

1 files changed, 12 insertions, 11 deletions

diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 7c5f4b13ea..5cde7c4ac2 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -922,17 +922,18 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
                 }
             }
         }
-        QString bundle_dir_f = escapeFilePath(bundle_dir);
-        QHash<QString, QString>::ConstIterator symIt = symlinks.constBegin(),
-                                               symEnd = symlinks.constEnd();
-        for (; symIt != symEnd; ++symIt) {
-            bundledFiles << symIt.key();
-            alldeps << symIt.key();
-            t << escapeDependencyPath(symIt.key()) << ":\n\t"
-              << mkdir_p_asstring(bundle_dir) << "\n\t"
-              << "@$(SYMLINK) " << escapeFilePath(symIt.value()) << ' ' << bundle_dir_f << endl;
-        }
-        if (!project->first("QMAKE_FRAMEWORK_VERSION").isEmpty()) {
+        if (!symlinks.isEmpty()) {
+            QString bundle_dir_f = escapeFilePath(bundle_dir);
+            QHash<QString, QString>::ConstIterator symIt = symlinks.constBegin(),
+                                                   symEnd = symlinks.constEnd();
+            for (; symIt != symEnd; ++symIt) {
+                bundledFiles << symIt.key();
+                alldeps << symIt.key();
+                t << escapeDependencyPath(symIt.key()) << ":\n\t"
+                  << mkdir_p_asstring(bundle_dir) << "\n\t"
+                  << "@$(SYMLINK) " << escapeFilePath(symIt.value()) << ' ' << bundle_dir_f << endl;
+            }
+
             QString currentLink = bundle_dir + "Versions/Current";
             QString currentLink_f = escapeDependencyPath(currentLink);
             bundledFiles << currentLink;