forked from qt-creator/qt-creator
CMakeProjectManager: Use QList in PresetsData
Less impedance when interfacing the rest of the code. Fixes warning: comparison of integer expressions of different signedness: ‘std::vector<....>::size_type’ {aka ‘long unsigned int’} and ‘qsizetype’ {aka ‘long long int’} [-Wsign-compare] Change-Id: If5e1e770e2ed170aa4259963fa7ca0d6642190d9 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
@@ -35,7 +35,7 @@ bool parseCMakeMinimumRequired(const QJsonValue &jsonValue, QVersionNumber &vers
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool parseConfigurePresets(const QJsonValue &jsonValue,
|
bool parseConfigurePresets(const QJsonValue &jsonValue,
|
||||||
std::vector<PresetsDetails::ConfigurePreset> &configurePresets)
|
QList<PresetsDetails::ConfigurePreset> &configurePresets)
|
||||||
{
|
{
|
||||||
// The whole section is optional
|
// The whole section is optional
|
||||||
if (jsonValue.isUndefined())
|
if (jsonValue.isUndefined())
|
||||||
@@ -185,7 +185,7 @@ bool parseConfigurePresets(const QJsonValue &jsonValue,
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool parseBuildPresets(const QJsonValue &jsonValue,
|
bool parseBuildPresets(const QJsonValue &jsonValue,
|
||||||
std::vector<PresetsDetails::BuildPreset> &buildPresets)
|
QList<PresetsDetails::BuildPreset> &buildPresets)
|
||||||
{
|
{
|
||||||
// The whole section is optional
|
// The whole section is optional
|
||||||
if (jsonValue.isUndefined())
|
if (jsonValue.isUndefined())
|
||||||
|
@@ -96,8 +96,8 @@ public:
|
|||||||
int version = 0;
|
int version = 0;
|
||||||
QVersionNumber cmakeMinimimRequired;
|
QVersionNumber cmakeMinimimRequired;
|
||||||
QHash<QString, QString> vendor;
|
QHash<QString, QString> vendor;
|
||||||
std::vector<PresetsDetails::ConfigurePreset> configurePresets;
|
QList<PresetsDetails::ConfigurePreset> configurePresets;
|
||||||
std::vector<PresetsDetails::BuildPreset> buildPresets;
|
QList<PresetsDetails::BuildPreset> buildPresets;
|
||||||
};
|
};
|
||||||
|
|
||||||
class PresetsParser
|
class PresetsParser
|
||||||
|
Reference in New Issue
Block a user