diff options
| author | Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com> | 2012-04-05 16:31:40 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-11 15:11:20 +0200 |
| commit | 358fd91951f26cbb552daaf9d28c49429302b6ab (patch) | |
| tree | 99bfeed60f506670cbb801396861a4188bb3d714 /src/plugins | |
| parent | e3bbfe00d1f71ba21889eec438e9438c0ee35c0a (diff) | |
Make QFileOpenEvents delivered again.
Create a FileOpenEvent within QWindowSystemInterfacePrivate and handle
it in QWindowSystemSystemInterface and QGuiApplication
Change-Id: Ie777c923958d83d56e8648c9bfb1f9dcb985654d
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm index 947d91005d..ec086fe62c 100644 --- a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm +++ b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm @@ -80,6 +80,8 @@ #include <qurl.h> #include <qdebug.h> #include <qguiapplication.h> +#include "qt_mac_p.h" +#include <QtGui/QWindowSystemInterface> QT_USE_NAMESPACE @@ -217,7 +219,7 @@ static void cleanupCocoaApplicationDelegate() { Q_UNUSED(filenames); Q_UNUSED(sender); -/* + for (NSString *fileName in filenames) { QString qtFileName = QCFString::toQString(fileName); if (inLaunch) { @@ -228,14 +230,13 @@ static void cleanupCocoaApplicationDelegate() if (qApp->arguments().contains(qtFileName)) continue; } - QFileOpenEvent foe(qtFileName); - qt_sendSpontaneousEvent(qAppInstance(), &foe); + QWindowSystemInterface::handleFileOpenEvent(qtFileName); } if (reflectionDelegate && [reflectionDelegate respondsToSelector:@selector(application:openFiles:)]) [reflectionDelegate application:sender openFiles:filenames]; -*/ + } - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender |