diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:05:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 14:02:43 +0200 |
| commit | 7cbee5629604aa49c618829c8e3e55fc64e94df7 (patch) | |
| tree | d12041105160c1cb21226b365edb9653d87b5853 /src/printsupport/dialogs/qabstractprintdialog.cpp | |
| parent | e400b7e326c554ccd819448866265953d2a0f24d (diff) | |
| parent | 5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qmenu.cpp
Change-Id: I6d3baf56eb24501cddb129a3cb6b958ccc25a308
Diffstat (limited to 'src/printsupport/dialogs/qabstractprintdialog.cpp')
| -rw-r--r-- | src/printsupport/dialogs/qabstractprintdialog.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/printsupport/dialogs/qabstractprintdialog.cpp b/src/printsupport/dialogs/qabstractprintdialog.cpp index 3c5f882f2ee..f982da46d9f 100644 --- a/src/printsupport/dialogs/qabstractprintdialog.cpp +++ b/src/printsupport/dialogs/qabstractprintdialog.cpp @@ -43,8 +43,6 @@ #include "qprinter.h" #include "private/qprinter_p.h" -#ifndef QT_NO_PRINTDIALOG - QT_BEGIN_NAMESPACE // hack @@ -497,5 +495,3 @@ void QPrintDialog::open(QObject *receiver, const char *member) } QT_END_NAMESPACE - -#endif // QT_NO_PRINTDIALOG |