diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro index a118daf93a84eabad859e77c3b333b80f9a023eb..c65054df867b6cbf93c1ab19da3c42e3e45ba896 100644 --- a/src/plugins/coreplugin/coreplugin.pro +++ b/src/plugins/coreplugin/coreplugin.pro @@ -213,9 +213,7 @@ win32 { LIBS += -lole32 } else:macx { - OBJECTIVE_SOURCES += progressmanager/progressmanager_mac.mm \ - fullscreen.mm - + OBJECTIVE_SOURCES += progressmanager/progressmanager_mac.mm LIBS += -framework AppKit } else:unix { diff --git a/src/plugins/coreplugin/fullscreen.mm b/src/plugins/coreplugin/fullscreen.mm deleted file mode 100644 index 3f8510196dccdee1c97184957e6cd433bd3bc4fc..0000000000000000000000000000000000000000 --- a/src/plugins/coreplugin/fullscreen.mm +++ /dev/null @@ -1,46 +0,0 @@ -/************************************************************************** -** -** This file is part of Qt Creator -** -** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: Nokia Corporation (info@qt.nokia.com) -** -** -** GNU Lesser General Public License Usage -** -** 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, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. -** -**************************************************************************/ - -#import <Cocoa/Cocoa.h> -#include <QWidget> - -void enableMacFullScreen(WId winId) -{ -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 - if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_7) { - NSView *nsview = reinterpret_cast<NSView *>(winId); - NSWindow *nswindow = [nsview window]; - [nswindow setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary]; - } -#endif -} - diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index 527e75c0efc625bc6dc80886b1b38ded599f3c54..2a23400adbe9b1838124bfcf65d05e35d08f5e44 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -225,11 +225,6 @@ MainWindow::MainWindow() : //signal(SIGINT, handleSigInt); #endif -#ifdef Q_WS_MAC - extern void enableMacFullScreen(WId); - enableMacFullScreen(winId()); -#endif - statusBar()->setProperty("p_styled", true); setAcceptDrops(true); }