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>

diff --git a/examples/dialogs/licensewizard/licensewizard.cpp b/examples/dialogs/licensewizard/licensewizard.cpp
index c73b99b..1c95871 100644 (file)
--- 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 8560329..898f8b8 100644 (file)
--- 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 922b45c..9cdedc1 100644 (file)
--- 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