diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-22 18:00:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-22 18:00:32 (GMT) |
| commit | 3d9f5b56f1c26c2bccedae04eb9536fed3474d43 (patch) | |
| tree | b5530bab26b47f6a5b19d8970818e88403f2fd68 /src/gui | |
| parent | 71cc2f69171f5dd6d8ae094239230362fc8db081 (diff) | |
| parent | 0b68204919a81c2aeca7924711cd5e159dca7903 (diff) | |
| download | Qt-3d9f5b56f1c26c2bccedae04eb9536fed3474d43.zip Qt-3d9f5b56f1c26c2bccedae04eb9536fed3474d43.tar.gz Qt-3d9f5b56f1c26c2bccedae04eb9536fed3474d43.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
If the QEventDispatcherGlibc causes warnings, it should say so
Remove a warning message that no longer appears after all on Windows
Drag & Drop failing in itemviews on Cocoa.
qdoc: Removed debug code.
qdoc: Fixed reporting of read-only status for QML properties.
Fix the smallFont test failure for Mac and Linux
Revert "Compile fix for MSVC"
Compile fix for MSVC
Improve QAccessible for QAccessibleTabBar
Improve QAccessible for QTabBar
fix the export macros for the QtDBus module
rebuild configure.exe
make "configure -qt-gif" work again on Windows
Fix a typo in harfbuzz thai line breaking.
Ensure that font sizes that are > 0 and < 1 are still respected
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qcocoaview_mac.mm | 5 | ||||
| -rw-r--r-- | src/gui/widgets/qtabbar.cpp | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm index 1935531..a552ce7 100644 --- a/src/gui/kernel/qcocoaview_mac.mm +++ b/src/gui/kernel/qcocoaview_mac.mm @@ -390,7 +390,10 @@ static int qCocoaViewCount = 0; if (QDragManager::self()->source()) mimeData = QDragManager::self()->dragPrivate()->data; QDragMoveEvent qDMEvent(posDrag, qtAllowed, mimeData, QApplication::mouseButtons(), modifiers); - qDMEvent.setDropAction(QT_PREPEND_NAMESPACE(qt_mac_dnd_answer_rec).lastAction); + if (QT_PREPEND_NAMESPACE(qt_mac_dnd_answer_rec).lastAction != Qt::IgnoreAction + && QT_PREPEND_NAMESPACE(qt_mac_dnd_answer_rec).buttons == qDMEvent.mouseButtons() + && QT_PREPEND_NAMESPACE(qt_mac_dnd_answer_rec).modifiers == qDMEvent.keyboardModifiers()) + qDMEvent.setDropAction(QT_PREPEND_NAMESPACE(qt_mac_dnd_answer_rec).lastAction); qDMEvent.accept(); QApplication::sendEvent(qwidget, &qDMEvent); diff --git a/src/gui/widgets/qtabbar.cpp b/src/gui/widgets/qtabbar.cpp index d692307..bbc7e5d 100644 --- a/src/gui/widgets/qtabbar.cpp +++ b/src/gui/widgets/qtabbar.cpp @@ -1219,6 +1219,12 @@ void QTabBar::setCurrentIndex(int index) if (oldIndex >= 0 && oldIndex < count()) d->layoutTab(oldIndex); d->layoutTab(index); +#ifndef QT_NO_ACCESSIBILITY + if (QAccessible::isActive()) { + QAccessible::updateAccessibility(this, index + 1, QAccessible::Focus); + QAccessible::updateAccessibility(this, index + 1, QAccessible::Selection); + } +#endif #ifdef QT3_SUPPORT emit selected(index); #endif |