Convert features.printpreviewdialog to QT_[REQUIRE_]CONFIG
Change-Id: If38d70b1e098c0cc680b913b2c4087681ad2a41e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
parent
18e5d10426
commit
e0b39313b0
@ -5,8 +5,7 @@ HEADERS += \
|
|||||||
dialogs/qabstractprintdialog_p.h \
|
dialogs/qabstractprintdialog_p.h \
|
||||||
dialogs/qpagesetupdialog_p.h \
|
dialogs/qpagesetupdialog_p.h \
|
||||||
dialogs/qpagesetupdialog.h \
|
dialogs/qpagesetupdialog.h \
|
||||||
dialogs/qprintdialog.h \
|
dialogs/qprintdialog.h
|
||||||
dialogs/qprintpreviewdialog.h
|
|
||||||
|
|
||||||
osx {
|
osx {
|
||||||
OBJECTIVE_SOURCES += dialogs/qpagesetupdialog_mac.mm \
|
OBJECTIVE_SOURCES += dialogs/qpagesetupdialog_mac.mm \
|
||||||
@ -33,8 +32,12 @@ INCLUDEPATH += $$PWD
|
|||||||
|
|
||||||
SOURCES += \
|
SOURCES += \
|
||||||
dialogs/qabstractprintdialog.cpp \
|
dialogs/qabstractprintdialog.cpp \
|
||||||
dialogs/qpagesetupdialog.cpp \
|
dialogs/qpagesetupdialog.cpp
|
||||||
dialogs/qprintpreviewdialog.cpp
|
|
||||||
|
qtConfig(printpreviewdialog) {
|
||||||
|
HEADERS += dialogs/qprintpreviewdialog.h
|
||||||
|
SOURCES += dialogs/qprintpreviewdialog.cpp
|
||||||
|
}
|
||||||
|
|
||||||
FORMS += dialogs/qpagesetupwidget.ui
|
FORMS += dialogs/qpagesetupwidget.ui
|
||||||
RESOURCES += dialogs/qprintdialog.qrc
|
RESOURCES += dialogs/qprintdialog.qrc
|
||||||
|
@ -56,8 +56,6 @@
|
|||||||
#include <QtWidgets/qtoolbar.h>
|
#include <QtWidgets/qtoolbar.h>
|
||||||
#include <QtCore/QCoreApplication>
|
#include <QtCore/QCoreApplication>
|
||||||
|
|
||||||
#ifndef QT_NO_PRINTPREVIEWDIALOG
|
|
||||||
|
|
||||||
#include "private/qdialog_p.h"
|
#include "private/qdialog_p.h"
|
||||||
|
|
||||||
#include <QtWidgets/qformlayout.h>
|
#include <QtWidgets/qformlayout.h>
|
||||||
@ -787,7 +785,3 @@ QT_END_NAMESPACE
|
|||||||
|
|
||||||
#include "moc_qprintpreviewdialog.cpp"
|
#include "moc_qprintpreviewdialog.cpp"
|
||||||
#include "qprintpreviewdialog.moc"
|
#include "qprintpreviewdialog.moc"
|
||||||
|
|
||||||
#endif // QT_NO_PRINTPREVIEWDIALOG
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -42,12 +42,11 @@
|
|||||||
|
|
||||||
#include <QtPrintSupport/qtprintsupportglobal.h>
|
#include <QtPrintSupport/qtprintsupportglobal.h>
|
||||||
|
|
||||||
#ifndef QT_NO_PRINTPREVIEWDIALOG
|
|
||||||
|
|
||||||
#include <QtWidgets/qdialog.h>
|
#include <QtWidgets/qdialog.h>
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_REQUIRE_CONFIG(printpreviewdialog);
|
||||||
|
|
||||||
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
class QGraphicsView;
|
class QGraphicsView;
|
||||||
class QPrintPreviewDialogPrivate;
|
class QPrintPreviewDialogPrivate;
|
||||||
@ -91,6 +90,4 @@ private:
|
|||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
#endif // QT_NO_PRINTPREVIEWDIALOG
|
|
||||||
|
|
||||||
#endif // QPRINTPREVIEWDIALOG_H
|
#endif // QPRINTPREVIEWDIALOG_H
|
||||||
|
Loading…
Reference in New Issue
Block a user