diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-02 08:21:15 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-02 08:21:15 (GMT) |
| commit | 021908ba7c6a6052d497ccbd09871894d54c644d (patch) | |
| tree | fa7d3bb65f12c08c9480fe74bd1ab148019b5eac /src | |
| parent | 0f10e3603fc5f24ebd3773cb2976d0bb24fcbd17 (diff) | |
| parent | c025442b7aa9726c4e563bf93473aa69fadc0f5f (diff) | |
| download | Qt-021908ba7c6a6052d497ccbd09871894d54c644d.zip Qt-021908ba7c6a6052d497ccbd09871894d54c644d.tar.gz Qt-021908ba7c6a6052d497ccbd09871894d54c644d.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Revert "fix QFileInfo::isSymLink() for NTFS mount points"
Fix typo for ifdef QT_NO_ACCESSIBILITY
Call QAccessible::updateAccessibility when a widget is deleted
Don't include qdbusvirtualobject header twice.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dbus/dbus.pro | 3 | ||||
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index d21b380..37e5925 100644 --- a/src/dbus/dbus.pro +++ b/src/dbus/dbus.pro @@ -61,8 +61,7 @@ HEADERS += $$PUB_HEADERS \ qdbuspendingcall_p.h \ qdbus_symbols_p.h \ qdbusservicewatcher.h \ - qdbusunixfiledescriptor.h \ - qdbusvirtualobject.h + qdbusunixfiledescriptor.h SOURCES += qdbusconnection.cpp \ qdbusconnectioninterface.cpp \ qdbuserror.cpp \ diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index a2109b4..ad8fbb7 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -1670,6 +1670,10 @@ QWidget::~QWidget() if (!d->children.isEmpty()) d->deleteChildren(); +#ifndef QT_NO_ACCESSIBILITY + QAccessible::updateAccessibility(this, 0, QAccessible::ObjectDestroyed); +#endif + QApplication::removePostedEvents(this); QT_TRY { |