diff options
| -rw-r--r-- | examples/dialogs/licensewizard/licensewizard.cpp | 2 | ||||
| -rw-r--r-- | src/modules/qt_printsupport.pri | 2 | ||||
| -rw-r--r-- | src/widgets/effects/qpixmapfilter.cpp | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/examples/dialogs/licensewizard/licensewizard.cpp b/examples/dialogs/licensewizard/licensewizard.cpp index c73b99b8b2..1c9587161b 100644 --- a/examples/dialogs/licensewizard/licensewizard.cpp +++ b/examples/dialogs/licensewizard/licensewizard.cpp @@ -352,10 +352,12 @@ void ConclusionPage::setVisible(bool visible) void ConclusionPage::printButtonClicked() { +#ifndef QT_NO_PRINTER QPrinter printer; QPrintDialog dialog(&printer, this); if (dialog.exec()) QMessageBox::warning(this, tr("Print License"), tr("As an environmentally friendly measure, the " "license text will not actually be printed.")); +#endif } diff --git a/src/modules/qt_printsupport.pri b/src/modules/qt_printsupport.pri index 85603296a6..898f8b82b6 100644 --- a/src/modules/qt_printsupport.pri +++ b/src/modules/qt_printsupport.pri @@ -12,3 +12,5 @@ QT.printsupport.plugins = $$QT_MODULE_PLUGIN_BASE QT.printsupport.imports = $$QT_MODULE_IMPORT_BASE QT.printsupport.depends = core gui widgets QT.printsupport.DEFINES = QT_PRINTSUPPORT_LIB +# To be implemented: +win32: QT.printsupport.DEFINES *= QT_NO_PRINTER diff --git a/src/widgets/effects/qpixmapfilter.cpp b/src/widgets/effects/qpixmapfilter.cpp index 922b45cb61..9cdedc19a3 100644 --- a/src/widgets/effects/qpixmapfilter.cpp +++ b/src/widgets/effects/qpixmapfilter.cpp @@ -904,7 +904,7 @@ Q_WIDGETS_EXPORT void qt_blurImage(QImage &blurImage, qreal radius, bool quality expblur<12, 10, false>(blurImage, radius, quality, transposed); } -Q_WIDGETS_EXPORT bool qt_scaleForTransform(const QTransform &transform, qreal *scale); +Q_GUI_EXPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); /*! \internal |