diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2014-07-13 13:43:49 +0200 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2014-07-13 13:48:19 +0200 |
| commit | 12a4db710e0e663741e239d76ffe4625e94dace2 (patch) | |
| tree | a8265beb2afb55be429c2811b1434936548bb459 /src/plugins/platforms/cocoa/qcocoaintegration.h | |
| parent | ff7fdf78efb7287af6347c710ac00a0d17d9dfc1 (diff) | |
Revert "Session management for OS X"
Broke tst_QMenu::statusTip by closing the menu while it should not. (and therefore, a QTimer::singleShot that fires while following test are running is making the test fail)
This reverts commit 50c04d631858639c630e85456e7e003a80e33493.
Change-Id: Ib4ef8190f945b915fe268745cc64d471994c5e2d
Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoaintegration.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaintegration.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.h b/src/plugins/platforms/cocoa/qcocoaintegration.h index 9942ac09cc..5ca2ccc571 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.h +++ b/src/plugins/platforms/cocoa/qcocoaintegration.h @@ -141,14 +141,6 @@ public: void setToolbar(QWindow *window, NSToolbar *toolbar); NSToolbar *toolbar(QWindow *window) const; void clearToolbars(); - - void setWindow(NSWindow* nsWindow, QCocoaWindow *window); - QCocoaWindow *window(NSWindow *window); - -#ifndef QT_NO_SESSIONMANAGER - QPlatformSessionManager *createPlatformSessionManager(const QString &id, const QString &key) const; -#endif - private: static QCocoaIntegration *mInstance; |