diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-08-26 11:46:28 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-08-26 12:13:56 +0200 |
| commit | ca56c9400cdd49c42a7554aafb32f84b128647fc (patch) | |
| tree | 08155d6845bda1b74e579a8009882c771482b26b /src | |
| parent | 32f43000c5a2f66c09d385a0aca16f96c772110e (diff) | |
Temporarily disable printers on Windows, fix export.
Change-Id: I351692b53cf559cd3be64cec8907bd544ba41593
Reviewed-on: http://codereview.qt.nokia.com/3653
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/qt_printsupport.pri | 2 | ||||
| -rw-r--r-- | src/widgets/effects/qpixmapfilter.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
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 |