diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 20:45:28 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-06-07 20:45:28 +0000 |
| commit | 678ff94ff29db1b0faa4aa8d486d4df544ce3247 (patch) | |
| tree | 83168a97a01972ba97f8156ce50b040b48379b91 /src/printsupport/widgets/qprintpreviewwidget.cpp | |
| parent | 0169edf6fd136415a1eb4b68b7d5384a843ca335 (diff) | |
| parent | 7cbee5629604aa49c618829c8e3e55fc64e94df7 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev
Diffstat (limited to 'src/printsupport/widgets/qprintpreviewwidget.cpp')
| -rw-r--r-- | src/printsupport/widgets/qprintpreviewwidget.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/printsupport/widgets/qprintpreviewwidget.cpp b/src/printsupport/widgets/qprintpreviewwidget.cpp index fd1cf68587..b28e693612 100644 --- a/src/printsupport/widgets/qprintpreviewwidget.cpp +++ b/src/printsupport/widgets/qprintpreviewwidget.cpp @@ -48,8 +48,6 @@ #include <QtWidgets/qscrollbar.h> #include <QtWidgets/qstyleoption.h> -#ifndef QT_NO_PRINTPREVIEWWIDGET - QT_BEGIN_NAMESPACE namespace { @@ -831,5 +829,3 @@ QT_END_NAMESPACE #include "moc_qprintpreviewwidget.cpp" #include "qprintpreviewwidget.moc" - -#endif // QT_NO_PRINTPREVIEWWIDGET |