diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-31 08:24:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-31 08:24:21 +0200 |
| commit | f510a51dace0cb39a93b057b8fcbcbdda33a956e (patch) | |
| tree | cd1dac8a78ecbb7579c59bf9f0b0d2d6fba56b4a /src/printsupport/widgets/qcupsjobwidget_p.h | |
| parent | ccedc853a67da078ace234af7b23fbf861736f3f (diff) | |
| parent | 84830fc07d65d58fce9b24b5ec8f1224b0969ac0 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I843994939f126ced22f7fe978ec4403f599fc7c9
Diffstat (limited to 'src/printsupport/widgets/qcupsjobwidget_p.h')
| -rw-r--r-- | src/printsupport/widgets/qcupsjobwidget_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/printsupport/widgets/qcupsjobwidget_p.h b/src/printsupport/widgets/qcupsjobwidget_p.h index e08b8b0574..5320818f30 100644 --- a/src/printsupport/widgets/qcupsjobwidget_p.h +++ b/src/printsupport/widgets/qcupsjobwidget_p.h @@ -54,12 +54,12 @@ // #include <QtPrintSupport/private/qtprintsupportglobal_p.h> -#include <ui_qcupsjobwidget.h> #include <private/qcups_p.h> -QT_BEGIN_NAMESPACE - #if !defined(QT_NO_PRINTER) && !defined(QT_NO_CUPS) +#include <ui_qcupsjobwidget.h> + +QT_BEGIN_NAMESPACE class QString; class QTime; @@ -107,8 +107,8 @@ private: Q_DISABLE_COPY(QCupsJobWidget) }; -#endif // QT_NO_PRINTER / QT_NO_CUPS - QT_END_NAMESPACE +#endif // QT_NO_PRINTER / QT_NO_CUPS + #endif // QCUPSJOBWIDGET_P_H |