whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add qtprintsupportglobal_p.h and fix qtprintsupportglobal.h 

Include qtwidgetsglobal.h from qtprintsupportglobal.h.
Add qtprintsupportglobal_p.h.
Include those headers from all header files in the module.

Change-Id: I8d8b2012ee7d513172b985e13fdfeb3493d26d23
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
bb10
Lars Knoll 2016-06-03 14:51:20 +02:00
parent 8fc1cd085c
commit a013bec13e
26 changed files with 83 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/printsupport/dialogs/qabstractprintdialog.h
View File

@ -40,8 +40,8 @@
#ifndef QABSTRACTPRINTDIALOG_H
#define QABSTRACTPRINTDIALOG_H
#include <QtWidgets/qdialog.h>
#include <QtPrintSupport/qtprintsupportglobal.h>
#include <QtWidgets/qdialog.h>
QT_BEGIN_NAMESPACE

1
src/printsupport/dialogs/qabstractprintdialog_p.h
View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtPrintSupport/private/qtprintsupportglobal_p.h>
#include "private/qdialog_p.h"
#ifndef QT_NO_PRINTDIALOG

2
src/printsupport/dialogs/qpagesetupdialog.h
View File

@ -40,8 +40,8 @@
#ifndef QPAGESETUPDIALOG_H
#define QPAGESETUPDIALOG_H
#include <QtWidgets/qdialog.h>
#include <QtPrintSupport/qtprintsupportglobal.h>
#include <QtWidgets/qdialog.h>
QT_BEGIN_NAMESPACE

1
src/printsupport/dialogs/qpagesetupdialog_p.h
View File

@ -52,6 +52,7 @@
//
//
#include <QtPrintSupport/private/qtprintsupportglobal_p.h>
#include "private/qdialog_p.h"
#ifndef QT_NO_PRINTDIALOG

2
src/printsupport/dialogs/qpagesetupdialog_unix_p.h
View File

@ -51,7 +51,7 @@
//
//
#include "qglobal.h"
#include <QtPrintSupport/private/qtprintsupportglobal_p.h>
#ifndef QT_NO_PRINTDIALOG

1
src/printsupport/dialogs/qprintdialog.h
View File

@ -40,6 +40,7 @@
#ifndef QPRINTDIALOG_H
#define QPRINTDIALOG_H
#include <QtPrintSupport/qtprintsupportglobal.h>
#include <QtPrintSupport/qabstractprintdialog.h>
QT_BEGIN_NAMESPACE

2
src/printsupport/dialogs/qprintpreviewdialog.h
View File

@ -40,8 +40,8 @@
#ifndef QPRINTPREVIEWDIALOG_H
#define QPRINTPREVIEWDIALOG_H
#include <QtWidgets/qdialog.h>
#include <QtPrintSupport/qtprintsupportglobal.h>
#include <QtWidgets/qdialog.h>
#ifndef QT_NO_PRINTPREVIEWDIALOG

1
src/printsupport/kernel/kernel.pri
View File

@ -11,6 +11,7 @@ HEADERS += \
$$PWD/qplatformprintdevice.h \
$$PWD/qplatformprintplugin.h \
$$PWD/qplatformprintersupport.h \
$$PWD/qtprintsupportglobal_p.h \
$$PWD/qtprintsupportglobal.h
SOURCES += \

2
src/printsupport/kernel/qcups_p.h
View File

@ -50,6 +50,8 @@
//
// We mean it.
//
#include <QtPrintSupport/private/qtprintsupportglobal_p.h>
#include "QtCore/qstring.h"
#include "QtCore/qstringlist.h"
#include "QtPrintSupport/qprinter.h"

2
src/printsupport/kernel/qpaintengine_alpha_p.h
View File

@ -51,7 +51,7 @@
// We mean it.
//
#include <QtCore/qglobal.h>
#include <QtPrintSupport/private/qtprintsupportglobal_p.h>
#ifndef QT_NO_PRINTER
#include "private/qpaintengine_p.h"

1
src/printsupport/kernel/qpaintengine_preview_p.h
View File

@ -52,6 +52,7 @@
//
//
#include <QtPrintSupport/private/qtprintsupportglobal_p.h>
#include <QtGui/qpaintengine.h>
#include <QtPrintSupport/qprintengine.h>

1
src/printsupport/kernel/qplatformprintdevice.h
View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtPrintSupport/qtprintsupportglobal.h>
#include <private/qprint_p.h>
#include <QtCore/qvector.h>

1
src/printsupport/kernel/qplatformprintersupport.h
View File

@ -48,6 +48,7 @@
// source and binary incompatible with future versions of Qt.
//
#include <QtPrintSupport/qtprintsupportglobal.h>
#include <QtPrintSupport/qprinter.h>
#include <QtCore/qstringlist.h>

2
src/printsupport/kernel/qplatformprintplugin.h
View File

@ -49,9 +49,9 @@
// source and binary incompatible with future versions of Qt.
//
#include <QtPrintSupport/qtprintsupportglobal.h>
#include <QtCore/qplugin.h>
#include <QtCore/qfactoryinterface.h>
#include <QtPrintSupport/qtprintsupportglobal.h>
QT_BEGIN_NAMESPACE

1
src/printsupport/kernel/qprint_p.h
View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtPrintSupport/private/qtprintsupportglobal_p.h>
#include <QtPrintSupport/qprinter.h>
#include <QtCore/qstring.h>

1
src/printsupport/kernel/qprintdevice_p.h
View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtPrintSupport/private/qtprintsupportglobal_p.h>
#include "private/qprint_p.h"
#include <QtCore/qsharedpointer.h>

1
src/printsupport/kernel/qprintengine.h
View File

@ -40,6 +40,7 @@
#ifndef QPRINTENGINE_H
#define QPRINTENGINE_H
#include <QtPrintSupport/qtprintsupportglobal.h>
#include <QtCore/qvariant.h>
#include <QtPrintSupport/qprinter.h>

2
src/printsupport/kernel/qprintengine_win_p.h
View File

@ -51,7 +51,7 @@
// We mean it.
//
#include <QtCore/qglobal.h>
#include <QtPrintSupport/private/qtprintsupportglobal_p.h>
#ifndef QT_NO_PRINTER

2
src/printsupport/kernel/qprinter.h
View File

@ -40,11 +40,11 @@
#ifndef QPRINTER_H
#define QPRINTER_H
#include <QtPrintSupport/qtprintsupportglobal.h>
#include <QtCore/qstring.h>
#include <QtCore/qscopedpointer.h>
#include <QtGui/qpagedpaintdevice.h>
#include <QtGui/qpagelayout.h>
#include <QtPrintSupport/qtprintsupportglobal.h>
QT_BEGIN_NAMESPACE

2
src/printsupport/kernel/qprinter_p.h
View File

@ -52,7 +52,7 @@
//
#include "QtCore/qglobal.h"
#include <QtPrintSupport/private/qtprintsupportglobal_p.h>
#ifndef QT_NO_PRINTER

1
src/printsupport/kernel/qprinterinfo.h
View File

@ -40,6 +40,7 @@
#ifndef QPRINTERINFO_H
#define QPRINTERINFO_H
#include <QtPrintSupport/qtprintsupportglobal.h>
#include <QtPrintSupport/qprinter.h>
#include <QtCore/QList>

2
src/printsupport/kernel/qprinterinfo_p.h
View File

@ -51,7 +51,7 @@
// We mean it.
//
#include "QtCore/qglobal.h"
#include <QtPrintSupport/private/qtprintsupportglobal_p.h>
#ifndef QT_NO_PRINTER

2
src/printsupport/kernel/qtprintsupportglobal.h
View File

@ -40,7 +40,7 @@
#ifndef QTPRINTSUPPORTGLOBAL_H
#define QTPRINTSUPPORTGLOBAL_H
#include <QtCore/qglobal.h>
#include <QtWidgets/qtwidgetsglobal.h>
QT_BEGIN_NAMESPACE

57
src/printsupport/kernel/qtprintsupportglobal_p.h Normal file
View File

@ -0,0 +1,57 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtPrintSupport module 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 The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/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 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or (at your option) the GNU General
** Public license version 3 or any later version approved by the KDE Free
** Qt Foundation. The licenses are as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
** https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QTPRINTSUPPORTGLOBAL_P_H
#define QTPRINTSUPPORTGLOBAL_P_H
//
// W A R N I N G
// -------------
//
// This file is not part of the Qt API. It exists purely as an
// implementation detail. This header file may change from version to
// version without notice, or even be removed.
//
// We mean it.
//
#include <QtPrintSupport/qtprintsupportglobal.h>
#include <QtWidgets/private/qtwidgetsglobal_p.h>
#endif // QTPRINTSUPPORTGLOBAL_P_H

1
src/printsupport/widgets/qcupsjobwidget_p.h
View File

@ -53,6 +53,7 @@
//
//
#include <QtPrintSupport/private/qtprintsupportglobal_p.h>
#include <ui_qcupsjobwidget.h>
#include <private/qcups_p.h>

1
src/printsupport/widgets/qprintpreviewwidget.h
View File

@ -40,6 +40,7 @@
#ifndef QPRINTPREVIEWWIDGET_H
#define QPRINTPREVIEWWIDGET_H
#include <QtPrintSupport/qtprintsupportglobal.h>
#include <QtWidgets/qwidget.h>
#include <QtPrintSupport/qprinter.h>