diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2010-10-20 01:42:32 (GMT) |
|---|---|---|
| committer | Joona Petrell <joona.t.petrell@nokia.com> | 2010-10-20 01:42:34 (GMT) |
| commit | e3af86a892cd7ce70297f0b1e76390cfd18536e2 (patch) | |
| tree | ffab2f02e0db96a55280d8b9bf0ac4774edb7d65 /tests/benchmarks/declarative | |
| parent | a25b49d33f1a4fb3eb9d903f3ce2e7cec08aec43 (diff) | |
| download | Qt-e3af86a892cd7ce70297f0b1e76390cfd18536e2.zip Qt-e3af86a892cd7ce70297f0b1e76390cfd18536e2.tar.gz Qt-e3af86a892cd7ce70297f0b1e76390cfd18536e2.tar.bz2 | |
Fix conflict between QDeclarativeGraphics_DerivedObject declared both in qdeclarativeglobal and tst_creation.cpp
Task-number:
Reviewed-by: Martin Jones
Diffstat (limited to 'tests/benchmarks/declarative')
| -rw-r--r-- | tests/benchmarks/declarative/creation/tst_creation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/benchmarks/declarative/creation/tst_creation.cpp b/tests/benchmarks/declarative/creation/tst_creation.cpp index 6bf7943..7026c40 100644 --- a/tests/benchmarks/declarative/creation/tst_creation.cpp +++ b/tests/benchmarks/declarative/creation/tst_creation.cpp @@ -243,7 +243,7 @@ void tst_creation::qobject_alloc() } } -struct QDeclarativeGraphics_DerivedObject : public QObject +struct QDeclarativeGraphics_Derived : public QObject { void setParent_noEvent(QObject *parent) { bool sce = d_ptr->sendChildEvents; @@ -255,7 +255,7 @@ struct QDeclarativeGraphics_DerivedObject : public QObject inline void QDeclarativeGraphics_setParent_noEvent(QObject *object, QObject *parent) { - static_cast<QDeclarativeGraphics_DerivedObject *>(object)->setParent_noEvent(parent); + static_cast<QDeclarativeGraphics_Derived *>(object)->setParent_noEvent(parent); } void tst_creation::itemtree_notree_cpp() |