Merge remote-tracking branch 'origin/5.0'

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/libs/utils/processreaper.cpp
	src/plugins/android/androidbuildapkstep.cpp
	src/plugins/cmakeprojectmanager/cmakeprocess.cpp

Change-Id: I353a445b5862f63362ea954749b5565360951283

src/plugins/clangtools/unit-tests/qt-essential-includes/main.cpp

@@ -1,7 +1,11 @@
 #include <QtCore>
 #include <QtGui>
+#ifdef QT_MULTIMEDIA_LIB
 #include <QtMultimedia>
+#endif
+#ifdef QT_MULTIMEDIAWIDGETS_LIB
 #include <QtMultimediaWidgets>
+#endif
 #include <QtNetwork>
 #include <QtQml>
 #include <QtQuick>

src/plugins/clangtools/unit-tests/qt-essential-includes/qt-essential-includes.pro

@@ -1,12 +1,18 @@
-QT += multimedia \
-      multimediawidgets \
-      network \
+QT += network \
       qml \
       quick \
       sql \
       testlib \
       widgets
 
+qtHaveModule(multimedia) {
+    QT += multimedia
+}
+
+qtHaveModule(multimediawidgets) {
+    QT += multimediawidgets
+}
+
 TARGET = qt-essential-includes
 TEMPLATE = app
 SOURCES += main.cpp

src/plugins/clangtools/unit-tests/qt-essential-includes/qt-essential-includes.qbs

@@ -6,8 +6,6 @@ QtApplication {
     Depends {
         name: "Qt"
         submodules: [
-            "multimedia",
-            "multimediawidgets",
             "network",
             "qml",
             "quick",
@@ -17,6 +15,9 @@ QtApplication {
         ]
     }
 
+    Depends { name: "Qt.multimedia"; required: false }
+    Depends { name: "Qt.multimediawidgets"; required: false }
+
     files : [
         "main.cpp",
     ]