summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-16 01:29:47 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-16 01:29:47 (GMT)
commit140a96d0b860b045c18d53c1ac96e77b3893d31c (patch)
tree3dc9885e18c8d37955e073d415c02ac1656e0f30 /src/gui
parent07f724cd5abd0548fb32ed3469bde113daf028c4 (diff)
parentfc399f2cd81772fed179d59a6f53abe69a81083a (diff)
downloadQt-140a96d0b860b045c18d53c1ac96e77b3893d31c.zip
Qt-140a96d0b860b045c18d53c1ac96e77b3893d31c.tar.gz
Qt-140a96d0b860b045c18d53c1ac96e77b3893d31c.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (32 commits) Correctly support translation in QDeclarativePixmapCache Improve warning for non-Item delegates. Correctly support translation in QDeclarativeCompiler Small calculator fix. Improve declarative calculator example. Update examples autotest to use the runtime directly Support valuetypes as method return values Compile without Qt3 support. Doc Simplify dynamic resource loading to avoid cluttering Text API. Add Component.onDestruction attached property Use qmlInfo for image loading errors, not qWarning(). Visual test updates. Rename section so that it's not linked to by references to "JavaScript" Doc improvements Comments Remove unused parameter Correctly resolve, and load, IMG tags in Text element. Rename "sql" test so autotester doesn't get confused. Should work now, don't skip. ...
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/graphicsview/qgraphicsitem.cpp2
-rw-r--r--src/gui/kernel/qwidget.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 9e0ec2e..9759b39 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -1413,7 +1413,7 @@ QGraphicsItem::~QGraphicsItem()
QObjectPrivate *p = QObjectPrivate::get(o);
p->wasDeleted = true;
if (p->declarativeData) {
- QDeclarativeData::destroyed(p->declarativeData, o);
+ QAbstractDeclarativeData::destroyed(p->declarativeData, o);
p->declarativeData = 0;
}
}
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 4fba8cf..10fa4b9 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -1478,7 +1478,7 @@ QWidget::~QWidget()
QObjectPrivate::clearGuards(this);
if (d->declarativeData) {
- QDeclarativeData::destroyed(d->declarativeData, this);
+ QAbstractDeclarativeData::destroyed(d->declarativeData, this);
d->declarativeData = 0; // don't activate again in ~QObject
}