diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-27 11:31:32 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-27 11:31:32 +0200 |
| commit | 150b8ca29417de2cd423ff92478eaf4cb2906601 (patch) | |
| tree | aa1c43ee9d096a4464636bcb5f294a11846572f4 /src/printsupport | |
| parent | bd78389fc4fe0a4367696ba2fdcc6e8d09863698 (diff) | |
| parent | 16a36239ab9e9be45a940aeff94f35e29bdeb944 (diff) | |
Merge "Merge branch 'stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/printsupport')
| -rw-r--r-- | src/printsupport/dialogs/qpagesetupdialog_mac.mm | 3 | ||||
| -rw-r--r-- | src/printsupport/dialogs/qprintdialog_mac.mm | 4 | ||||
| -rw-r--r-- | src/printsupport/doc/src/external-resources.qdoc | 31 |
3 files changed, 4 insertions, 34 deletions
diff --git a/src/printsupport/dialogs/qpagesetupdialog_mac.mm b/src/printsupport/dialogs/qpagesetupdialog_mac.mm index 967f127b86..7180c01df4 100644 --- a/src/printsupport/dialogs/qpagesetupdialog_mac.mm +++ b/src/printsupport/dialogs/qpagesetupdialog_mac.mm @@ -39,11 +39,12 @@ ** ****************************************************************************/ -#ifndef QT_NO_PRINTDIALOG #include <Cocoa/Cocoa.h> #include "qpagesetupdialog.h" + +#ifndef QT_NO_PRINTDIALOG #include "qpagesetupdialog_p.h" #include <qpa/qplatformnativeinterface.h> diff --git a/src/printsupport/dialogs/qprintdialog_mac.mm b/src/printsupport/dialogs/qprintdialog_mac.mm index 37333f2593..bf1617065b 100644 --- a/src/printsupport/dialogs/qprintdialog_mac.mm +++ b/src/printsupport/dialogs/qprintdialog_mac.mm @@ -39,8 +39,6 @@ ** ****************************************************************************/ -#ifndef QT_NO_PRINTDIALOG - #include <Cocoa/Cocoa.h> #include "qprintdialog.h" @@ -52,6 +50,8 @@ #include <QtPrintSupport/qprinter.h> #include <QtPrintSupport/qprintengine.h> +#ifndef QT_NO_PRINTDIALOG + QT_BEGIN_NAMESPACE class QPrintDialogPrivate : public QAbstractPrintDialogPrivate diff --git a/src/printsupport/doc/src/external-resources.qdoc b/src/printsupport/doc/src/external-resources.qdoc deleted file mode 100644 index 0a829ac761..0000000000 --- a/src/printsupport/doc/src/external-resources.qdoc +++ /dev/null @@ -1,31 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \externalpage http://www.cups.org/ - \title Common Unix Printing System (CUPS) -*/
\ No newline at end of file |