forked from qt-creator/qt-creator
Nim: Fix build configuration factory priority
Change-Id: I3cdae467f14bf4fa76c3a477a715271a3d7f353b Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com> Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
committed by
Filippo Cucchetto
parent
845feec543
commit
21dc290360
@@ -40,6 +40,7 @@
|
|||||||
#include <projectexplorer/projectexplorerconstants.h>
|
#include <projectexplorer/projectexplorerconstants.h>
|
||||||
#include <projectexplorer/projectmacroexpander.h>
|
#include <projectexplorer/projectmacroexpander.h>
|
||||||
#include <projectexplorer/target.h>
|
#include <projectexplorer/target.h>
|
||||||
|
#include <utils/mimetypes/mimedatabase.h>
|
||||||
#include <utils/qtcassert.h>
|
#include <utils/qtcassert.h>
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
@@ -159,15 +160,22 @@ BuildConfiguration *NimBuildConfigurationFactory::clone(Target *parent, BuildCon
|
|||||||
|
|
||||||
int NimBuildConfigurationFactory::priority(const Kit *k, const QString &projectPath) const
|
int NimBuildConfigurationFactory::priority(const Kit *k, const QString &projectPath) const
|
||||||
{
|
{
|
||||||
Q_UNUSED(k);
|
MimeDatabase mdb;
|
||||||
Q_UNUSED(projectPath);
|
if (k && mdb.mimeTypeForFile(projectPath).matchesName(Constants::C_NIM_PROJECT_MIMETYPE))
|
||||||
return 0;
|
return 0;
|
||||||
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int NimBuildConfigurationFactory::priority(const Target *parent) const
|
int NimBuildConfigurationFactory::priority(const Target *parent) const
|
||||||
{
|
{
|
||||||
Q_UNUSED(parent);
|
return canHandle(parent) ? 0 : -1;
|
||||||
return 0;
|
}
|
||||||
|
|
||||||
|
bool NimBuildConfigurationFactory::canHandle(const Target *t) const
|
||||||
|
{
|
||||||
|
if (!t->project()->supportsKit(t->kit()))
|
||||||
|
return false;
|
||||||
|
return qobject_cast<NimProject *>(t->project());
|
||||||
}
|
}
|
||||||
|
|
||||||
FileName NimBuildConfigurationFactory::defaultBuildDirectory(const Kit *k,
|
FileName NimBuildConfigurationFactory::defaultBuildDirectory(const Kit *k,
|
||||||
|
|||||||
@@ -61,6 +61,7 @@ public:
|
|||||||
int priority(const ProjectExplorer::Target *parent) const override;
|
int priority(const ProjectExplorer::Target *parent) const override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
bool canHandle(const ProjectExplorer::Target *t) const;
|
||||||
static Utils::FileName defaultBuildDirectory(const ProjectExplorer::Kit *k,
|
static Utils::FileName defaultBuildDirectory(const ProjectExplorer::Kit *k,
|
||||||
const QString &projectPath,
|
const QString &projectPath,
|
||||||
const QString &bc, ProjectExplorer::BuildConfiguration::BuildType buildType);
|
const QString &bc, ProjectExplorer::BuildConfiguration::BuildType buildType);
|
||||||
|
|||||||
Reference in New Issue
Block a user