forked from qt-creator/qt-creator
Fix some compiler warnings
Change-Id: I9128afcf56bd47cb6627012bb6b0d13395b432ac Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -147,12 +147,6 @@ static bool imageHasContent(const QImage &image)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool isQuick3DMode()
|
|
||||||
{
|
|
||||||
static bool mode3D = qEnvironmentVariableIsSet("QMLDESIGNER_QUICK3D_MODE");
|
|
||||||
return mode3D;
|
|
||||||
}
|
|
||||||
|
|
||||||
static QObjectList toObjectList(const QVariant &variantList)
|
static QObjectList toObjectList(const QVariant &variantList)
|
||||||
{
|
{
|
||||||
QObjectList objList;
|
QObjectList objList;
|
||||||
|
|||||||
@@ -810,6 +810,8 @@ bool Check::visit(UiObjectInitializer *)
|
|||||||
|
|
||||||
void Check::endVisit(UiObjectInitializer *uiObjectInitializer)
|
void Check::endVisit(UiObjectInitializer *uiObjectInitializer)
|
||||||
{
|
{
|
||||||
|
Q_UNUSED(uiObjectInitializer)
|
||||||
|
|
||||||
m_propertyStack.pop();
|
m_propertyStack.pop();
|
||||||
|
|
||||||
const QString type = m_typeStack.pop();
|
const QString type = m_typeStack.pop();
|
||||||
|
|||||||
@@ -51,9 +51,9 @@ static Q_LOGGING_CATEGORY(avdDialogLog, "qtc.android.avdDialog", QtWarningMsg)
|
|||||||
|
|
||||||
AvdDialog::AvdDialog(const AndroidConfig &config, QWidget *parent)
|
AvdDialog::AvdDialog(const AndroidConfig &config, QWidget *parent)
|
||||||
: QDialog(parent),
|
: QDialog(parent),
|
||||||
|
m_allowedNameChars(QLatin1String("[a-z|A-Z|0-9|._-]*")),
|
||||||
m_androidConfig(config),
|
m_androidConfig(config),
|
||||||
m_sdkManager(m_androidConfig),
|
m_sdkManager(m_androidConfig)
|
||||||
m_allowedNameChars(QLatin1String("[a-z|A-Z|0-9|._-]*"))
|
|
||||||
{
|
{
|
||||||
m_avdDialog.setupUi(this);
|
m_avdDialog.setupUi(this);
|
||||||
m_hideTipTimer.setInterval(2000);
|
m_hideTipTimer.setInterval(2000);
|
||||||
|
|||||||
@@ -148,8 +148,8 @@ public:
|
|||||||
{}
|
{}
|
||||||
|
|
||||||
explicit Import(int moduleId, int majorVersion, int minorVersion, int sourceId)
|
explicit Import(int moduleId, int majorVersion, int minorVersion, int sourceId)
|
||||||
: moduleId{moduleId}
|
: version{majorVersion, minorVersion}
|
||||||
, version{majorVersion, minorVersion}
|
, moduleId{moduleId}
|
||||||
, sourceId{sourceId}
|
, sourceId{sourceId}
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
|||||||
@@ -46,6 +46,8 @@ QPixmap NewProjectDialogImageProvider::invalidStyleIcon()
|
|||||||
|
|
||||||
QPixmap NewProjectDialogImageProvider::requestStatusPixmap(const QString &id, QSize *size, const QSize &requestedSize)
|
QPixmap NewProjectDialogImageProvider::requestStatusPixmap(const QString &id, QSize *size, const QSize &requestedSize)
|
||||||
{
|
{
|
||||||
|
Q_UNUSED(size)
|
||||||
|
|
||||||
QPixmap pixmap;
|
QPixmap pixmap;
|
||||||
|
|
||||||
if (id == "status-warning") {
|
if (id == "status-warning") {
|
||||||
|
|||||||
@@ -65,6 +65,7 @@ int NewProjectCategoryModel::rowCount(const QModelIndex &) const
|
|||||||
|
|
||||||
QVariant NewProjectCategoryModel::data(const QModelIndex &index, int role) const
|
QVariant NewProjectCategoryModel::data(const QModelIndex &index, int role) const
|
||||||
{
|
{
|
||||||
|
Q_UNUSED(role)
|
||||||
return categories().at(index.row());
|
return categories().at(index.row());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -84,6 +85,7 @@ int NewProjectModel::rowCount(const QModelIndex &) const
|
|||||||
|
|
||||||
QVariant NewProjectModel::data(const QModelIndex &index, int role) const
|
QVariant NewProjectModel::data(const QModelIndex &index, int role) const
|
||||||
{
|
{
|
||||||
|
Q_UNUSED(role)
|
||||||
return projectsOfCurrentCategory().at(index.row()).name;
|
return projectsOfCurrentCategory().at(index.row()).name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user