diff --git a/src/plugins/qmakeprojectmanager/qmakeandroidbuildapkstep.h b/src/plugins/qmakeprojectmanager/qmakeandroidbuildapkstep.h
index 3a25c3bf04e..c1d4ff44c43 100644
--- a/src/plugins/qmakeprojectmanager/qmakeandroidbuildapkstep.h
+++ b/src/plugins/qmakeprojectmanager/qmakeandroidbuildapkstep.h
@@ -44,11 +44,10 @@ public:
     explicit QmakeAndroidBuildApkStepFactory(QObject *parent = 0);
 
     QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const;
-    QString displayNameForId(const Core::Id id) const;
+    QString displayNameForId(Core::Id id) const;
 
-    bool canCreate(ProjectExplorer::BuildStepList *parent,
-                   const Core::Id id) const;
-    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id);
+    bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const;
+    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id);
 
     bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const;
     ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map);
diff --git a/src/plugins/qmakeprojectmanager/qmakeandroidrunfactories.cpp b/src/plugins/qmakeprojectmanager/qmakeandroidrunfactories.cpp
index 0cea9cc73bf..83746dc7bbd 100644
--- a/src/plugins/qmakeprojectmanager/qmakeandroidrunfactories.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeandroidrunfactories.cpp
@@ -61,12 +61,12 @@ QmakeAndroidRunConfigurationFactory::QmakeAndroidRunConfigurationFactory(QObject
 {
 }
 
-QString QmakeAndroidRunConfigurationFactory::displayNameForId(const Core::Id id) const
+QString QmakeAndroidRunConfigurationFactory::displayNameForId(Core::Id id) const
 {
     return QFileInfo(pathFromId(id)).completeBaseName();
 }
 
-bool QmakeAndroidRunConfigurationFactory::canCreate(Target *parent, const Core::Id id) const
+bool QmakeAndroidRunConfigurationFactory::canCreate(Target *parent, Core::Id id) const
 {
     if (!canHandle(parent))
         return false;
@@ -100,7 +100,7 @@ QList<Core::Id> QmakeAndroidRunConfigurationFactory::availableCreationIds(Target
     return QmakeProject::idsForNodes(base, nodes);
 }
 
-RunConfiguration *QmakeAndroidRunConfigurationFactory::doCreate(Target *parent, const Core::Id id)
+RunConfiguration *QmakeAndroidRunConfigurationFactory::doCreate(Target *parent, Core::Id id)
 {
     if (parent->project()->rootProjectNode())
         return new QmakeAndroidRunConfiguration(parent, id, parent->project()->rootProjectNode()->path());
@@ -132,7 +132,9 @@ bool QmakeAndroidRunConfigurationFactory::canHandle(Target *t) const
             && qobject_cast<QmakeProject *>(t->project());
 }
 
-#warning FIX ME !!!
+#ifdef Q_CC_GCC
+#  warning FIX ME !!!
+#endif
 QList<RunConfiguration *> QmakeAndroidRunConfigurationFactory::runConfigurationsForNode(Target *t, ProjectExplorer::Node *n)
 {
     QList<ProjectExplorer::RunConfiguration *> result;
diff --git a/src/plugins/qmakeprojectmanager/qmakeandroidrunfactories.h b/src/plugins/qmakeprojectmanager/qmakeandroidrunfactories.h
index bc4a71aead0..e0a74af2e05 100644
--- a/src/plugins/qmakeprojectmanager/qmakeandroidrunfactories.h
+++ b/src/plugins/qmakeprojectmanager/qmakeandroidrunfactories.h
@@ -51,10 +51,10 @@ class QmakeAndroidRunConfigurationFactory : public ProjectExplorer::IRunConfigur
 public:
     explicit QmakeAndroidRunConfigurationFactory(QObject *parent = 0);
 
-    QString displayNameForId(const Core::Id id) const;
+    QString displayNameForId(Core::Id id) const;
     QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode = UserCreate) const;
 
-    bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const;
+    bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const;
 
     bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const;
 
@@ -67,7 +67,7 @@ public:
 private:
     bool canHandle(ProjectExplorer::Target *t) const;
 
-    ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, const Core::Id id);
+    ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, Core::Id id);
     ProjectExplorer::RunConfiguration *doRestore(ProjectExplorer::Target *parent,
                                                  const QVariantMap &map);
 };