From 12a4db710e0e663741e239d76ffe4625e94dace2 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Sun, 13 Jul 2014 13:43:49 +0200 Subject: 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 --- src/plugins/platforms/cocoa/qcocoaintegration.mm | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/plugins/platforms/cocoa/qcocoaintegration.mm') diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm index 49e602f45c..4be49ed68f 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.mm +++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm @@ -54,7 +54,6 @@ #include "qcocoainputcontext.h" #include "qcocoamimetypes.h" #include "qcocoaaccessibility.h" -#include "qcocoasessionmanager.h" #include #include @@ -417,13 +416,6 @@ QCocoaScreen *QCocoaIntegration::screenAtIndex(int index) return mScreens.at(index); } -#ifndef QT_NO_SESSIONMANAGER -QPlatformSessionManager *QCocoaIntegration::createPlatformSessionManager(const QString &id, const QString &key) const -{ - return new QCocoaSessionManager(id, key); -} -#endif - bool QCocoaIntegration::hasCapability(QPlatformIntegration::Capability cap) const { switch (cap) { -- cgit v1.2.3