diff options
author | Liang Qi <liang.qi@qt.io> | 2018-02-15 10:14:11 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-02-15 10:14:11 +0100 |
commit | bb0fec8057dd11c359bfcb4aefb66d9b210f52a6 (patch) | |
tree | 903e3220087ff7a3210390933ba3d8b8f7eb5ea3 /examples | |
parent | 8920bf32eebe03cfc8a1a5e97f5b34c09c79a11b (diff) | |
parent | 4ba535616b8d3dfda7fbe162c6513f3008c1077a (diff) |
Merge remote-tracking branch 'origin/5.10' into 5.11
Conflicts:
src/corelib/corelib.pro
src/corelib/global/qrandom.cpp
src/network/access/qhttpnetworkrequest_p.h
src/plugins/platforms/cocoa/qcocoamenu.mm
src/plugins/platforms/cocoa/qcocoansmenu.mm
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/cocoa/qnsview.mm
src/plugins/platforms/offscreen/qoffscreenintegration.h
src/widgets/kernel/qaction.cpp
src/widgets/widgets.pro
Done-with: Andy Shaw <andy.shaw@qt.io>
Change-Id: Ib01547cf4184023f19858ccf0ce7fb824fed2a8d
Diffstat (limited to 'examples')
-rw-r--r-- | examples/gui/rasterwindow/rasterwindow.cpp | 1 | ||||
-rw-r--r-- | examples/widgets/tutorials/notepad/notepad.cpp | 11 | ||||
-rw-r--r-- | examples/widgets/tutorials/notepad/notepad.pro | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/examples/gui/rasterwindow/rasterwindow.cpp b/examples/gui/rasterwindow/rasterwindow.cpp index 68d1d7f524..3eacd20145 100644 --- a/examples/gui/rasterwindow/rasterwindow.cpp +++ b/examples/gui/rasterwindow/rasterwindow.cpp @@ -111,6 +111,7 @@ void RasterWindow::renderNow() painter.fillRect(0, 0, width(), height(), Qt::white); render(&painter); + painter.end(); m_backingStore->endPaint(); m_backingStore->flush(rect); diff --git a/examples/widgets/tutorials/notepad/notepad.cpp b/examples/widgets/tutorials/notepad/notepad.cpp index b4f6cf7f8f..44d8597cb7 100644 --- a/examples/widgets/tutorials/notepad/notepad.cpp +++ b/examples/widgets/tutorials/notepad/notepad.cpp @@ -52,8 +52,15 @@ #include <QFileDialog> #include <QTextStream> #include <QMessageBox> +#if defined(QT_PRINTSUPPORT_LIB) +#include <QtPrintSupport/qtprintsupportglobal.h> +#if QT_CONFIG(printer) +#if QT_CONFIG(printdialog) #include <QPrintDialog> +#endif // QT_CONFIG(printdialog) #include <QPrinter> +#endif // QT_CONFIG(printer) +#endif // QT_PRINTSUPPORT_LIB #include <QFont> #include <QFontDialog> @@ -136,11 +143,15 @@ void Notepad::on_actionSave_as_triggered() void Notepad::on_actionPrint_triggered() { +#if QT_CONFIG(printer) QPrinter printDev; +#if QT_CONFIG(printdialog) QPrintDialog dialog(&printDev, this); if (dialog.exec() == QDialog::Rejected) return; +#endif // QT_CONFIG(printdialog) ui->textEdit->print(&printDev); +#endif // QT_CONFIG(printer) } void Notepad::on_actionExit_triggered() diff --git a/examples/widgets/tutorials/notepad/notepad.pro b/examples/widgets/tutorials/notepad/notepad.pro index a552dacf00..6451f22735 100644 --- a/examples/widgets/tutorials/notepad/notepad.pro +++ b/examples/widgets/tutorials/notepad/notepad.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = notepad -QT += printsupport +qtHaveModule(printsupport): QT += printsupport requires(qtConfig(fontdialog)) SOURCES += \ |