diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-28 09:23:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-28 09:28:31 +0200 |
| commit | b48a13fd6843e12b5725aa3ff0d010007e7c43b4 (patch) | |
| tree | 316cfe36fc67906efcd92ff806c7c0da56ed4f8e /src/printsupport/dialogs/qprintpreviewdialog.cpp | |
| parent | 3398d9d40cb0dae2dc2a1a4f7dc3b4b9cceae903 (diff) | |
| parent | 15fe60cfdada84ea519f08e905d59cc3fb6d20cd (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
examples/examples.pro
tests/auto/corelib/tools/qchar/tst_qchar.cpp
tests/auto/other/qaccessibility/accessiblewidgets.h
Change-Id: I426696c40ab57d14dc295b8103152cede79f244c
Diffstat (limited to 'src/printsupport/dialogs/qprintpreviewdialog.cpp')
| -rw-r--r-- | src/printsupport/dialogs/qprintpreviewdialog.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/printsupport/dialogs/qprintpreviewdialog.cpp b/src/printsupport/dialogs/qprintpreviewdialog.cpp index 4bed0b6454..33ba842a1f 100644 --- a/src/printsupport/dialogs/qprintpreviewdialog.cpp +++ b/src/printsupport/dialogs/qprintpreviewdialog.cpp @@ -40,7 +40,6 @@ #include "qprintpreviewdialog.h" #include "qprintpreviewwidget.h" #include <private/qprinter_p.h> -#include "private/qdialog_p.h" #include "qprintdialog.h" #include <QtWidgets/qaction.h> @@ -59,6 +58,8 @@ #ifndef QT_NO_PRINTPREVIEWDIALOG +#include "private/qdialog_p.h" + #include <QtWidgets/qformlayout.h> #include <QtWidgets/qlabel.h> |