diff options
7 files changed, 7 insertions, 4 deletions
diff --git a/examples/opengl/cube/geometryengine.cpp b/examples/opengl/cube/geometryengine.cpp index e3d14d95de..d8dfeab822 100644 --- a/examples/opengl/cube/geometryengine.cpp +++ b/examples/opengl/cube/geometryengine.cpp @@ -151,7 +151,7 @@ void GeometryEngine::drawCubeGeometry(QGLShaderProgram *program) glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, vboIds[1]); // Offset for position - int offset = 0; + quintptr offset = 0; // Tell OpenGL programmable pipeline how to locate vertex position data int vertexLocation = program->attributeLocation("a_position"); diff --git a/examples/qtestlib/tutorial5/benchmarking.cpp b/examples/qtestlib/tutorial5/benchmarking.cpp index c731677c1b..3a245f22cb 100644 --- a/examples/qtestlib/tutorial5/benchmarking.cpp +++ b/examples/qtestlib/tutorial5/benchmarking.cpp @@ -92,6 +92,7 @@ void TestBenchmark::multiple() result = (str1 == str2); } } + Q_UNUSED(result); } //! [2] @@ -127,6 +128,7 @@ void TestBenchmark::series() result = (str1 == str2); } } + Q_UNUSED(result); } //! [5] diff --git a/src/gui/itemmodels/qstandarditemmodel.cpp b/src/gui/itemmodels/qstandarditemmodel.cpp index 13d7a5c7a7..079be121d5 100644 --- a/src/gui/itemmodels/qstandarditemmodel.cpp +++ b/src/gui/itemmodels/qstandarditemmodel.cpp @@ -2714,7 +2714,6 @@ bool QStandardItemModel::hasChildren(const QModelIndex &parent) const */ QModelIndex QStandardItemModel::sibling(int row, int column, const QModelIndex &idx) const { - Q_D(const QStandardItemModel); return createIndex(row, column, idx.internalPointer()); } diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp index 405a16d488..b5756bd06c 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection.cpp @@ -927,7 +927,7 @@ xcb_timestamp_t QXcbConnection::getTimestamp() // to add the new set of events to its event queue while (true) { connection()->sync(); - if (event = checkEvent(checker)) + if ((event = checkEvent(checker))) break; } diff --git a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp index 3417e18b7f..4c64d0f58a 100644 --- a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp +++ b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp @@ -340,7 +340,7 @@ public: int enters; inline BlockableWindow() - : QWindow(), blocked(false), enters(0), leaves(0) {} + : QWindow(), blocked(false), leaves(0), enters(0) {} bool event(QEvent *e) { diff --git a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp index 0e9420fcbe..b6a0a7b1fa 100644 --- a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp +++ b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp @@ -569,6 +569,7 @@ public: SetRecordReimplModel(QObject *parent, QSqlDatabase db):QSqlTableModel(parent, db) {} bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) { + Q_UNUSED(value); return QSqlTableModel::setData(index, QString("Qt"), role); } }; diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp index 8ccd13ff3e..b068413632 100644 --- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp +++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp @@ -1544,6 +1544,7 @@ public: {} void setEditorData(QWidget *editor, const QModelIndex &index) const Q_DECL_OVERRIDE { + Q_UNUSED(index); static bool w = true; editor->setEnabled(w); w = !w; |