summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-02-07 10:24:49 +0100
committerAndrew den Exter <andrew.den-exter@nokia.com>2012-02-08 00:57:50 +0100
commit504a6deeef537e918fa14de52b72b53c42a11a28 (patch)
tree082eeab911c72aacced5f707865e2b55e1ad74c1 /tests/auto/declarative
parentfd605735233bce061a5c541d7bd36c77fd588b99 (diff)
QtQuick1: Fix warnings of gcc 4.6
- Fix warnings. - Remove duplicate entries from profile. Change-Id: I7b4a3cd71ec7d1c11b3530c95f57fef3a3041b16 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'tests/auto/declarative')
-rw-r--r--tests/auto/declarative/qdeclarativedebugjs/app/main.cpp2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/testtypes.h1
-rw-r--r--tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp4
3 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/declarative/qdeclarativedebugjs/app/main.cpp b/tests/auto/declarative/qdeclarativedebugjs/app/main.cpp
index 733394c6..50bd5d7b 100644
--- a/tests/auto/declarative/qdeclarativedebugjs/app/main.cpp
+++ b/tests/auto/declarative/qdeclarativedebugjs/app/main.cpp
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
}
QObject *obj = component.create();
-
+ Q_UNUSED(obj)
// printf("%u\n", QDeclarativeDebugService::idForObject(obj));
// fflush(stdout);
diff --git a/tests/auto/declarative/qdeclarativelanguage/testtypes.h b/tests/auto/declarative/qdeclarativelanguage/testtypes.h
index 4f22aab2..e652382e 100644
--- a/tests/auto/declarative/qdeclarativelanguage/testtypes.h
+++ b/tests/auto/declarative/qdeclarativelanguage/testtypes.h
@@ -588,6 +588,7 @@ public:
class MyParserStatus : public QObject, public QDeclarativeParserStatus
{
Q_OBJECT
+ Q_INTERFACES(QDeclarativeParserStatus)
public:
MyParserStatus() : m_cbc(0), m_ccc(0) {}
diff --git a/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp b/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp
index a851a920..081d33ff 100644
--- a/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp
+++ b/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp
@@ -80,7 +80,7 @@ class SingleRoleModel : public QAbstractListModel
Q_OBJECT
public:
- SingleRoleModel(QObject *parent = 0) {
+ SingleRoleModel(QObject * /* parent */ = 0) {
QHash<int, QByteArray> roles;
roles.insert(Qt::DisplayRole , "name");
setRoleNames(roles);
@@ -101,7 +101,7 @@ public slots:
}
protected:
- int rowCount(const QModelIndex &parent = QModelIndex()) const {
+ int rowCount(const QModelIndex & /* parent */ = QModelIndex()) const {
return list.count();
}
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const {