Merge remote-tracking branch 'origin/13.0'

 Conflicts:
	src/plugins/android/androidsettingswidget.cpp

Change-Id: Ifcb16aa16c7bc2792de25d0ee7a22cf0e39a05f8

1 files changed, 8 insertions, 0 deletions

diff --git a/src/plugins/qmakeprojectmanager/makefileparse.cpp b/src/plugins/qmakeprojectmanager/makefileparse.cpp
index 6ba748b0c1d..bfa504ed60a 100644
--- a/src/plugins/qmakeprojectmanager/makefileparse.cpp
+++ b/src/plugins/qmakeprojectmanager/makefileparse.cpp
@@ -56,6 +56,7 @@ void MakeFileParse::parseArgs(const QString &args, const QString &project,
     static const QRegularExpression regExp(QLatin1String("^([^\\s\\+-]*)\\s*(\\+=|=|-=|~=)(.*)$"));
     bool after = false;
     bool ignoreNext = false;
+    bool nextIsQtConfArg = false;
     m_unparsedArguments = args;
     ProcessArgs::ArgIterator ait(&m_unparsedArguments);
     while (ait.next()) {
@@ -63,11 +64,18 @@ void MakeFileParse::parseArgs(const QString &args, const QString &project,
             // Ignoring
             ignoreNext = false;
             ait.deleteArg();
+        } else if (nextIsQtConfArg) {
+            nextIsQtConfArg = false;
+            m_qtConfFile = FilePath::fromUserInput(ait.value());
+            ait.deleteArg();
         } else if (ait.value() == project) {
             ait.deleteArg();
         } else if (ait.value() == QLatin1String("-after")) {
             after = true;
             ait.deleteArg();
+        } else if (ait.value() == "-qtconf") {
+            nextIsQtConfArg = true;
+            ait.deleteArg();
         } else if (ait.value().contains(QLatin1Char('='))) {
             const QRegularExpressionMatch match = regExp.match(ait.value());
             if (match.hasMatch()) {