feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix compilation with MSVC2013.

Browse Source 
src\plugins\qmakeprojectmanager\qmakeandroidrunfactories.h(54) : warning C4373: 'QmakeProjectManager::Internal::QmakeAndroidRunConfigurationFactory::displayNameForId': virtual function overrides 'ProjectExplorer::IRunConfigurationFactory::displayNameForId', previous versions of the compiler did not override when parameters only differed by const/volatile qualifiers
        ..\..\plugins\projectexplorer/runconfiguration.h(222) : see declaration of 'ProjectExplorer::IRunConfigurationFactory::displayNameForId'
src\plugins\qmakeprojectmanager\qmakeandroidrunfactories.h(57) : warning C4373: 'QmakeProjectManager::Internal::QmakeAndroidRunConfigurationFactory::canCreate': virtual function overrides 'ProjectExplorer::IRunConfigurationFactory::canCreate', previous versions of the compiler did not override when parameters only differed by const/volatile qualifiers
        ..\..\plugins\projectexplorer/runconfiguration.h(224) : see declaration of 'ProjectExplorer::IRunConfigurationFactory::canCreate'
src\plugins\qmakeprojectmanager\qmakeandroidrunfactories.h(70) : warning C4373: 'QmakeProjectManager::Internal::QmakeAndroidRunConfigurationFactory::doCreate': virtual function overrides 'ProjectExplorer::IRunConfigurationFactory::doCreate', previous versions of the compiler did not override when parameters only differed by const/volatile qualifiers
        ..\..\plugins\projectexplorer/runconfiguration.h(239) : see declaration of 'ProjectExplorer::IRunConfigurationFactory::doCreate'
.\qmakeandroidrunfactories.cpp(135) : fatal error C1021: invalid preprocessor command 'warning'

Change-Id: Ie20cecf18ac393bc014f5b2ddcf7fea527b8ca0d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Friedemann Kleint
2014-07-22 10:58:20 +02:00
parent 03ee5dc41f
commit 19a44fd769
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmakeprojectmanager/qmakeandroidbuildapkstep.h
View File

@@ -44,11 +44,10 @@ public:
explicit QmakeAndroidBuildApkStepFactory(QObject *parent = 0); explicit QmakeAndroidBuildApkStepFactory(QObject *parent = 0);
QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const; 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, bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const;
const Core::Id id) const; ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id);
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id);
bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const; bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const;
ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map); ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map);

8
src/plugins/qmakeprojectmanager/qmakeandroidrunfactories.cpp
View File

@@ -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(); 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)) if (!canHandle(parent))
return false; return false;
@@ -100,7 +100,7 @@ QList<Core::Id> QmakeAndroidRunConfigurationFactory::availableCreationIds(Target
return QmakeProject::idsForNodes(base, nodes); 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()) if (parent->project()->rootProjectNode())
return new QmakeAndroidRunConfiguration(parent, id, parent->project()->rootProjectNode()->path()); return new QmakeAndroidRunConfiguration(parent, id, parent->project()->rootProjectNode()->path());
@@ -132,7 +132,9 @@ bool QmakeAndroidRunConfigurationFactory::canHandle(Target *t) const
&& qobject_cast<QmakeProject *>(t->project()); && qobject_cast<QmakeProject *>(t->project());
} }
#ifdef Q_CC_GCC
# warning FIX ME !!! # warning FIX ME !!!
#endif
QList<RunConfiguration *> QmakeAndroidRunConfigurationFactory::runConfigurationsForNode(Target *t, ProjectExplorer::Node *n) QList<RunConfiguration *> QmakeAndroidRunConfigurationFactory::runConfigurationsForNode(Target *t, ProjectExplorer::Node *n)
{ {
QList<ProjectExplorer::RunConfiguration *> result; QList<ProjectExplorer::RunConfiguration *> result;

6
src/plugins/qmakeprojectmanager/qmakeandroidrunfactories.h
View File

@@ -51,10 +51,10 @@ class QmakeAndroidRunConfigurationFactory : public ProjectExplorer::IRunConfigur
public: public:
explicit QmakeAndroidRunConfigurationFactory(QObject *parent = 0); 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; 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; bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const;
@@ -67,7 +67,7 @@ public:
private: private:
bool canHandle(ProjectExplorer::Target *t) const; 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, ProjectExplorer::RunConfiguration *doRestore(ProjectExplorer::Target *parent,
const QVariantMap &map); const QVariantMap &map);
}; };