Changeset 561 for trunk/src/gui/dialogs/qprintdialog_mac.mm

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/dialogs/qprintdialog_mac.mm (modified) (6 diffs)

trunk/src/gui/dialogs/qprintdialog_mac.mm

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** 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.0, 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.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -122 +122 @@
 
 QT_USE_NAMESPACE
+
+#ifdef QT_MAC_USE_COCOA
 
 @class QCocoaPrintPanelDelegate;
@@ -167 +169 @@
         // Keep us in sync with file output
         PMDestinationType dest;
+
+        // If the user selected print to file, the session has been
+        // changed behind our back and our d->ep->session object is a
+        // dangling pointer. Update it based on the "current" session
+        d->ep->session = static_cast<PMPrintSession>([d->ep->printInfo PMPrintSession]);
+
         PMSessionGetDestinationType(d->ep->session, d->ep->settings, &dest);
         if (dest == kPMDestinationFile) {
@@ -191 +199 @@
 }
 @end
+
+#endif
 
 QT_BEGIN_NAMESPACE