Merge remote-tracking branch 'origin/4.11'

 Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/boot2qt/qdbrunconfiguration.cpp
	src/plugins/boot2qt/qdbrunconfiguration.h
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
	src/plugins/qnx/qnxrunconfiguration.cpp
	src/plugins/remotelinux/remotelinuxrunconfiguration.h

Change-Id: I17c8e1bf300bb75d7317ccf7749dd3cc07709c21

2 files changed, 3 insertions, 1 deletions

diff --git a/src/plugins/qmlprojectmanager/qmlproject.h b/src/plugins/qmlprojectmanager/qmlproject.h
index f0ad48cd5c..f12da342fe 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.h
+++ b/src/plugins/qmlprojectmanager/qmlproject.h
@@ -42,6 +42,8 @@ class QmlProjectItem;
 
 class QmlBuildSystem : public ProjectExplorer::BuildSystem
 {
+    Q_OBJECT
+
 public:
     explicit QmlBuildSystem(ProjectExplorer::Target *target);
     ~QmlBuildSystem();
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
index cb7293493d..1be8e33a2f 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
@@ -384,7 +384,7 @@ QString QmlProjectRunConfiguration::commandLineArguments() const
     const OsType osType = device ? device->osType() : HostOsInfo::hostOs();
 
     // arguments from .qmlproject file
-    const QmlBuildSystem *bs = static_cast<QmlBuildSystem *>(target()->buildSystem());
+    const QmlBuildSystem *bs = qobject_cast<QmlBuildSystem *>(target()->buildSystem());
     foreach (const QString &importPath,
              QmlBuildSystem::makeAbsolute(bs->targetDirectory(), bs->customImportPaths())) {
         QtcProcess::addArg(&args, "-I", osType);