diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-11-25 12:52:36 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-27 16:05:22 (GMT) |
| commit | 3d940a116770ec6b03f7ccef4a989760f6a2aee5 (patch) | |
| tree | d96c21effa84a291aa70ef877b800ae13558d3d5 | |
| parent | 84c38db29bb12e9debff1cb601d4f02b97c2ee89 (diff) | |
| download | Qt-3d940a116770ec6b03f7ccef4a989760f6a2aee5.zip Qt-3d940a116770ec6b03f7ccef4a989760f6a2aee5.tar.gz Qt-3d940a116770ec6b03f7ccef4a989760f6a2aee5.tar.bz2 | |
CoreWLan: Fix potential unhandled exception assert
-[QNSListener notificationHandler:] was declared as not taking any parameter,
but used as taking a single NSNotification. This would lead to an 'unrecognized
selector' exception raised by Cocoa.
Task-number: QTBUG-26844
Change-Id: I723b4c89b0faf1fe156a3c96cb1dd3abfad8daa6
Reviewed-by: Liang Qi <liang.qi@digia.com>
| -rw-r--r-- | src/plugins/bearer/corewlan/qcorewlanengine.mm | 5 | ||||
| -rw-r--r-- | src/plugins/bearer/corewlan/qcorewlanengine_10_6.mm | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm index b185809..d44794e 100644 --- a/src/plugins/bearer/corewlan/qcorewlanengine.mm +++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm @@ -71,7 +71,7 @@ extern "C" { // Otherwise it won't find CWKeychain* symbols at link time QCoreWlanEngine *engine; NSLock *locker; } -- (void)notificationHandler;//:(NSNotification *)notification; +- (void)notificationHandler:(NSNotification *)notification; - (void)remove; - (void)setEngine:(QCoreWlanEngine *)coreEngine; - (QCoreWlanEngine *)engine; @@ -120,8 +120,9 @@ extern "C" { // Otherwise it won't find CWKeychain* symbols at link time [locker unlock]; } -- (void)notificationHandler//:(NSNotification *)notification +- (void)notificationHandler:(NSNotification *)notification { + Q_UNUSED(notification); engine->requestUpdate(); } @end diff --git a/src/plugins/bearer/corewlan/qcorewlanengine_10_6.mm b/src/plugins/bearer/corewlan/qcorewlanengine_10_6.mm index a3bf615..79c2bb9 100644 --- a/src/plugins/bearer/corewlan/qcorewlanengine_10_6.mm +++ b/src/plugins/bearer/corewlan/qcorewlanengine_10_6.mm @@ -48,7 +48,7 @@ QCoreWlanEngine *engine; NSLock *locker; } -- (void)notificationHandler;//:(NSNotification *)notification; +- (void)notificationHandler:(NSNotification *)notification; - (void)remove; - (void)setEngine:(QCoreWlanEngine *)coreEngine; - (QCoreWlanEngine *)engine; @@ -97,8 +97,9 @@ [locker unlock]; } -- (void)notificationHandler//:(NSNotification *)notification +- (void)notificationHandler:(NSNotification *)notification { + Q_UNUSED(notification); engine->requestUpdate(); } @end |