summaryrefslogtreecommitdiffstats
path: root/src/qt3support/widgets/q3mainwindow.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/qt3support/widgets/q3mainwindow.cpp')
-rw-r--r--src/qt3support/widgets/q3mainwindow.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qt3support/widgets/q3mainwindow.cpp b/src/qt3support/widgets/q3mainwindow.cpp
index 194c483..e02d890 100644
--- a/src/qt3support/widgets/q3mainwindow.cpp
+++ b/src/qt3support/widgets/q3mainwindow.cpp
@@ -1,6 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the Qt3Support module of the Qt Toolkit.
@@ -20,10 +21,9 @@
** 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.
+** 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.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
@@ -1042,7 +1042,7 @@ void Q3MainWindow::addDockWindow(Q3DockWindow *dockWindow,
Qt::Dock edge, bool newLine)
{
Q_D(Q3MainWindow);
-#ifdef Q_WS_MAC
+#if defined (Q_WS_MAC) && !defined(QT_MAC_USE_COCOA)
extern WindowPtr qt_mac_window_for(const QWidget*); //qwidget_mac.cpp
if(isWindow() && edge == Qt::DockTop) {
d->createWinId();
@@ -1217,7 +1217,7 @@ void Q3MainWindow::removeDockWindow(Q3DockWindow * dockWindow)
{
Q_D(Q3MainWindow);
-#ifdef Q_WS_MAC
+#if defined (Q_WS_MAC) && !defined (QT_MAC_USE_COCOA)
extern WindowPtr qt_mac_window_for(const QWidget*); //qwidget_mac.cpp
if(isWindow() && dockWindow->area() == topDock() && !dockWindows(Qt::DockTop).count())
ChangeWindowAttributes(qt_mac_window_for(this), 0, kWindowToolbarButtonAttribute);