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

Conflicts:
	mkspecs/qnx-x86-qcc/qplatformdefs.h
	src/corelib/global/qglobal.h
	src/network/socket/qnativesocketengine_winrt.cpp
	src/plugins/platforms/android/androidjniaccessibility.cpp
	src/plugins/platforms/windows/qwindowswindow.cpp

Manually adjusted:
	mkspecs/qnx-armle-v7-qcc/qplatformdefs.h
	to include 9ce697f2d54be6d94381c72af28dda79cbc027d4

Thanks goes to Sergio for the qnx mkspecs adjustments.

Change-Id: I53b1fd6bc5bc884e5ee2c2b84975f58171a1cb8e

4 files changed, 15 insertions, 13 deletions

diff --git a/qmake/library/qmakeevaluator.cpp b/qmake/library/qmakeevaluator.cpp
index 2ea5ffd45e..8e1296e1e8 100644
--- a/qmake/library/qmakeevaluator.cpp
+++ b/qmake/library/qmakeevaluator.cpp
@@ -208,17 +208,17 @@ QMakeEvaluator::~QMakeEvaluator()
 {
 }
 
-void QMakeEvaluator::initFrom(const QMakeEvaluator &other)
+void QMakeEvaluator::initFrom(const QMakeEvaluator *other)
 {
-    Q_ASSERT_X(&other, "QMakeEvaluator::visitProFile", "Project not prepared");
-    m_functionDefs = other.m_functionDefs;
-    m_valuemapStack = other.m_valuemapStack;
+    Q_ASSERT_X(other, "QMakeEvaluator::visitProFile", "Project not prepared");
+    m_functionDefs = other->m_functionDefs;
+    m_valuemapStack = other->m_valuemapStack;
     m_valuemapInited = true;
-    m_qmakespec = other.m_qmakespec;
-    m_qmakespecName = other.m_qmakespecName;
-    m_mkspecPaths = other.m_mkspecPaths;
-    m_featureRoots = other.m_featureRoots;
-    m_dirSep = other.m_dirSep;
+    m_qmakespec = other->m_qmakespec;
+    m_qmakespecName = other->m_qmakespecName;
+    m_mkspecPaths = other->m_mkspecPaths;
+    m_featureRoots = other->m_featureRoots;
+    m_dirSep = other->m_dirSep;
 }
 
 //////// Evaluator tools /////////
@@ -1355,7 +1355,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProFile(
             return ReturnFalse;
 #endif
 
-        initFrom(*baseEnv->evaluator);
+        initFrom(baseEnv->evaluator);
     } else {
         if (!m_valuemapInited)
             loadDefaults();
diff --git a/qmake/library/qmakeevaluator.h b/qmake/library/qmakeevaluator.h
index de13033481..f322a48011 100644
--- a/qmake/library/qmakeevaluator.h
+++ b/qmake/library/qmakeevaluator.h
@@ -167,7 +167,7 @@ public:
     bool prepareProject(const QString &inDir);
     bool loadSpecInternal();
     bool loadSpec();
-    void initFrom(const QMakeEvaluator &other);
+    void initFrom(const QMakeEvaluator *other);
     void setupProject();
     void evaluateCommand(const QString &cmds, const QString &where);
     void applyExtraConfigs();
diff --git a/qmake/main.cpp b/qmake/main.cpp
index f5116ba752..82573a61fc 100644
--- a/qmake/main.cpp
+++ b/qmake/main.cpp
@@ -252,8 +252,10 @@ int runQMake(int argc, char **argv)
 #endif
         if(!dir.isNull() && dir != ".")
             Option::output_dir = dir;
-        if(QDir::isRelativePath(Option::output_dir))
+        if (QDir::isRelativePath(Option::output_dir)) {
+            Option::output.setFileName(fi.fileName());
             Option::output_dir.prepend(oldpwd + QLatin1Char('/'));
+        }
         Option::output_dir = QDir::cleanPath(Option::output_dir);
     }
 
diff --git a/qmake/project.cpp b/qmake/project.cpp
index 9f75d1da27..f3d22dfb2c 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -60,7 +60,7 @@ QMakeProject::QMakeProject()
 QMakeProject::QMakeProject(QMakeProject *p)
     : QMakeEvaluator(Option::globals, Option::parser, Option::vfs, &Option::evalHandler)
 {
-    initFrom(*p);
+    initFrom(p);
 }
 
 bool QMakeProject::boolRet(VisitReturn vr)