diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-25 10:54:16 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-25 10:54:16 (GMT) |
| commit | cb50699b39e016a64a2a06088042622546c428a2 (patch) | |
| tree | 77d269a3103a6c140098b9caaafd17a29a81addd /tests/benchmarks/declarative/creation | |
| parent | 89807f70656b95c1568ef183dd7f28c527fc3eaa (diff) | |
| parent | 890c1110ec5e39bb6e63e99fe09c296c1ea824be (diff) | |
| download | Qt-cb50699b39e016a64a2a06088042622546c428a2.zip Qt-cb50699b39e016a64a2a06088042622546c428a2.tar.gz Qt-cb50699b39e016a64a2a06088042622546c428a2.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
demos/declarative/snake/snake.qml
qmake/generators/symbian/symbiancommon.cpp
src/network/access/qnetworkaccessmanager.cpp
src/s60installs/s60installs.pro
tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
Diffstat (limited to 'tests/benchmarks/declarative/creation')
| -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() |