Merge remote-tracking branch 'origin/master' into 4.14

Change-Id: I4b37b89cc1dd2c53217579ea554af0fb7994fa7e

src/plugins/qmakeprojectmanager/profilecompletionassist.cpp

@@ -31,6 +31,23 @@ const TextEditor::Keywords &QmakeProjectManager::Internal::qmakeKeywords()
 {
     static TextEditor::Keywords keywords(
                 QStringList{ // variables
+                    "ANDROID_ABIS",
+                    "ANDROID_API_VERSION",
+                    "ANDROID_APPLICATION_ARGUMENTS",
+                    "ANDROID_BUNDLED_JAR_DEPENDENCIES",
+                    "ANDROID_DEPLOYMENT_DEPENDENCIES",
+                    "ANDROID_DEPLOYMENT_SETTINGS_FILE",
+                    "ANDROID_EXTRA_LIBS",
+                    "ANDROID_EXTRA_PLUGINS",
+                    "ANDROID_FEATURES",
+                    "ANDROID_LIB_DEPENDENCIES",
+                    "ANDROID_MIN_SDK_VERSION",
+                    "ANDROID_PACKAGE_SOURCE_DIR",
+                    "ANDROID_PERMISSIONS",
+                    "ANDROID_TARGET_SDK_VERSION",
+                    "ANDROID_TARGET_ARCH",
+                    "ANDROID_VERSION_CODE",
+                    "ANDROID_VERSION_NAME",
                     "ARGC",
                     "ARGS",
                     "BUILDS",

src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp

@@ -233,6 +233,7 @@ QmakePriFile::~QmakePriFile()
 
 void QmakePriFile::scheduleUpdate()
 {
+    QTC_ASSERT(m_buildSystem, return);
     QtSupport::ProFileCacheManager::instance()->discardFile(
                 filePath().toString(), m_buildSystem->qmakeVfs());
     m_qmakeProFile->scheduleUpdate(QmakeProFile::ParseLater);

src/plugins/qmakeprojectmanager/qmakestep.cpp

@@ -502,9 +502,9 @@ bool QMakeStep::fromMap(const QVariantMap &map)
     return BuildStep::fromMap(map);
 }
 
-BuildStepConfigWidget *QMakeStep::createConfigWidget()
+QWidget *QMakeStep::createConfigWidget()
 {
-    auto widget = new BuildStepConfigWidget(this);
+    auto widget = new QWidget;
 
     auto label_0 = new QLabel(tr("qmake build configuration:"), widget);
 

src/plugins/qmakeprojectmanager/qmakestep.h

@@ -122,7 +122,7 @@ public:
     bool init() override;
     void setupOutputFormatter(Utils::OutputFormatter *formatter) override;
     void doRun() override;
-    ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
+    QWidget *createConfigWidget() override;
     void setForced(bool b);
 
     enum class ArgumentFlag {