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/qcocoasessionmanager.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/qcocoasessionmanager.h')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoasessionmanager.h | 79 |
1 files changed, 0 insertions, 79 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoasessionmanager.h b/src/plugins/platforms/cocoa/qcocoasessionmanager.h deleted file mode 100644 index fe9ba1d075..0000000000 --- a/src/plugins/platforms/cocoa/qcocoasessionmanager.h +++ /dev/null @@ -1,79 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Samuel Gaist <samuel.gaist@edeltech.ch> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QCOCOASESSIONMANAGER_H -#define QCOCOASESSIONMANAGER_H - -// -// W A R N I N G -// ------------- -// -// This file is part of the QPA API and is not meant to be used -// in applications. Usage of this API may make your code -// source and binary incompatible with future versions of Qt. -// - -#ifndef QT_NO_SESSIONMANAGER - -#include <qpa/qplatformsessionmanager.h> - -QT_BEGIN_NAMESPACE - -class Q_GUI_EXPORT QCocoaSessionManager : public QPlatformSessionManager -{ -public: - QCocoaSessionManager(const QString &id, const QString &key); - virtual ~QCocoaSessionManager(); - - void cancel() Q_DECL_OVERRIDE; - bool wasCanceled() const; - -private: - bool m_canceled; - - Q_DISABLE_COPY(QCocoaSessionManager) -}; - -QT_END_NAMESPACE - -#endif // QT_NO_SESSIONMANAGER - -#endif // QCOCOASESSIONMANAGER_H |