diff options
| author | Mike McQuaid <mike.mcquaid@kdab.com> | 2011-07-26 11:43:48 (GMT) |
|---|---|---|
| committer | Jiang Jiang <jiang.jiang@nokia.com> | 2011-07-26 11:43:48 (GMT) |
| commit | 91be1263b42a0a91daf3f905661e356e31482fd3 (patch) | |
| tree | c002441ff8099c46417d28e3841c35843dfe79d3 /src/gui | |
| parent | 292656a345e33c332316a676465261c13c9a4aba (diff) | |
| download | Qt-91be1263b42a0a91daf3f905661e356e31482fd3.zip Qt-91be1263b42a0a91daf3f905661e356e31482fd3.tar.gz Qt-91be1263b42a0a91daf3f905661e356e31482fd3.tar.bz2 | |
Fix compilation under OSX 10.7 or using llvm-gcc.
Use correct error codes instead of type errors.
Thanks to Dylan Luke <lukes.dylan@gmail.com> for this patch.
Merge-request: 1304
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qcocoasharedwindowmethods_mac_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h index 3e8ce4e..a2eb484 100644 --- a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h +++ b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h @@ -327,7 +327,7 @@ QT_END_NAMESPACE QWidget *target = [self dragTargetHitTest:sender]; if (!target) - return [super draggingEntered:sender]; + return NSDragOperationNone; if (target->testAttribute(Qt::WA_DropSiteRegistered) == false) return NSDragOperationNone; @@ -339,7 +339,7 @@ QT_END_NAMESPACE { QWidget *target = [self dragTargetHitTest:sender]; if (!target) - return [super draggingUpdated:sender]; + return NSDragOperationNone; if (target == *currentDragTarget()) { // The drag continues to move over the widget that we have sendt @@ -363,7 +363,7 @@ QT_END_NAMESPACE { QWidget *target = [self dragTargetHitTest:sender]; if (!target) - return [super draggingExited:sender]; + return; if (*currentDragTarget()) { [reinterpret_cast<NSView *>((*currentDragTarget())->winId()) draggingExited:sender]; @@ -375,7 +375,7 @@ QT_END_NAMESPACE { QWidget *target = [self dragTargetHitTest:sender]; if (!target) - return [super performDragOperation:sender]; + return NO; BOOL dropResult = NO; if (*currentDragTarget()) { |