aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2014-01-14 12:31:39 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-15 10:45:05 +0100
commitc70b046648522c8a899fc1fa6e4d4a5924206313 (patch)
treed6f3b0a9f144268f4667d70f74312f29a9110f85
parent14ebfef611d5703e3a2d74cfb5a42f93e66644a6 (diff)
Fix some compiler warnings in tests and examples.
Change-Id: Ia739c995005635caf6fd0bd4e495ed8567350e83 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
-rw-r--r--examples/quick/models/abstractitemmodel/model.cpp1
-rw-r--r--tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp1
-rw-r--r--tests/auto/quick/qquickimage/tst_qquickimage.cpp1
-rw-r--r--tests/auto/quick/qquickview/tst_qquickview.cpp4
4 files changed, 3 insertions, 4 deletions
diff --git a/examples/quick/models/abstractitemmodel/model.cpp b/examples/quick/models/abstractitemmodel/model.cpp
index 724e2ed779..30eff6a7c0 100644
--- a/examples/quick/models/abstractitemmodel/model.cpp
+++ b/examples/quick/models/abstractitemmodel/model.cpp
@@ -67,6 +67,7 @@ void AnimalModel::addAnimal(const Animal &animal)
}
int AnimalModel::rowCount(const QModelIndex & parent) const {
+ Q_UNUSED(parent);
return m_animals.count();
}
diff --git a/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp b/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp
index 4f21231184..553663ac22 100644
--- a/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp
+++ b/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp
@@ -676,6 +676,7 @@ void tst_qqmlcontext::qobjectDerived()
QQmlContext context(engine.rootContext());
QObject *o1 = component.create(&context);
+ Q_UNUSED(o1);
QCOMPARE(command.count, 2);
}
diff --git a/tests/auto/quick/qquickimage/tst_qquickimage.cpp b/tests/auto/quick/qquickimage/tst_qquickimage.cpp
index 8bdb9c9de5..7fa58036dd 100644
--- a/tests/auto/quick/qquickimage/tst_qquickimage.cpp
+++ b/tests/auto/quick/qquickimage/tst_qquickimage.cpp
@@ -885,6 +885,7 @@ public:
QImage requestImage(const QString &id, QSize *size, const QSize& requestedSize)
{
+ Q_UNUSED(requestedSize);
if (id == QLatin1String("first-image.png")) {
QTest::qWait(50);
int width = 100;
diff --git a/tests/auto/quick/qquickview/tst_qquickview.cpp b/tests/auto/quick/qquickview/tst_qquickview.cpp
index a4ed1267ac..02c00ff073 100644
--- a/tests/auto/quick/qquickview/tst_qquickview.cpp
+++ b/tests/auto/quick/qquickview/tst_qquickview.cpp
@@ -186,10 +186,6 @@ void tst_QQuickView::resizemodeitem()
delete view;
}
-static void silentErrorsMsgHandler(QtMsgType, const QMessageLogContext &, const QString &)
-{
-}
-
void tst_QQuickView::errors()
{
QQuickView *view = new QQuickView;