Fix build.

- Introduced EXPORT definition for new QPrintSupport library.
- Fixed dependencies in src.pro
- Fixed some includes.

Change-Id: I9863233ca2767928b37cf3fd1fdec31351b5da6b
Reviewed-on: http://codereview.qt.nokia.com/3253
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

6 files changed, 0 insertions, 209 deletions

diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp
index a0fada2ca5..e0ba36919e 100644
--- a/src/plugins/platforms/windows/qwindowsintegration.cpp
+++ b/src/plugins/platforms/windows/qwindowsintegration.cpp
@@ -46,7 +46,6 @@
 #include "qwindowsglcontext.h"
 #include "qwindowsscreen.h"
 #include "qwindowsfontdatabase.h"
-#include "qwindowsprintersupport.h"
 #include "qwindowsguieventdispatcher.h"
 #include "qwindowsclipboard.h"
 #include "qwindowsdrag.h"
@@ -131,7 +130,6 @@ struct QWindowsIntegrationPrivate
 
     const bool m_openGL;
     QWindowsContext m_context;
-    QWindowsPrinterSupport m_printerSupport;
     QWindowsFontDatabase m_fontDatabase;
     QWindowsNativeInterface m_nativeInterface;
     QWindowsClipboard m_clipboard;
@@ -232,13 +230,6 @@ QPlatformFontDatabase *QWindowsIntegration::fontDatabase() const
     return &d->m_fontDatabase;
 }
 
-QPlatformPrinterSupport *QWindowsIntegration::printerSupport() const
-{
-    if (QWindowsContext::verboseIntegration)
-        qDebug() << __FUNCTION__;
-    return &d->m_printerSupport;
-}
-
 QPlatformNativeInterface *QWindowsIntegration::nativeInterface() const
 {
     return &d->m_nativeInterface;
diff --git a/src/plugins/platforms/windows/qwindowsintegration.h b/src/plugins/platforms/windows/qwindowsintegration.h
index a2d3d3acf0..70f12f8bfd 100644
--- a/src/plugins/platforms/windows/qwindowsintegration.h
+++ b/src/plugins/platforms/windows/qwindowsintegration.h
@@ -67,7 +67,6 @@ public:
     virtual QPlatformDrag *drag() const;
     virtual QPlatformInputContext *inputContext() const;
     virtual QPlatformNativeInterface *nativeInterface() const;
-    virtual QPlatformPrinterSupport *printerSupport() const;
     virtual QPlatformFontDatabase *fontDatabase() const;
 
     static QWindowsIntegration *instance();
diff --git a/src/plugins/platforms/windows/qwindowsnativeimage.cpp b/src/plugins/platforms/windows/qwindowsnativeimage.cpp
index 53311c5fd7..2ecf334b39 100644
--- a/src/plugins/platforms/windows/qwindowsnativeimage.cpp
+++ b/src/plugins/platforms/windows/qwindowsnativeimage.cpp
@@ -42,7 +42,6 @@
 #include "qwindowsnativeimage.h"
 #include "qwindowscontext.h"
 
-#include <QtGui/QColorMap>
 #include <QtGui/private/qpaintengine_p.h>
 #include <QtGui/private/qpaintengine_raster_p.h>
 
diff --git a/src/plugins/platforms/windows/qwindowsprintersupport.cpp b/src/plugins/platforms/windows/qwindowsprintersupport.cpp
deleted file mode 100644
index 3d43c61e10..0000000000
--- a/src/plugins/platforms/windows/qwindowsprintersupport.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qwindowsprintersupport.h"
-
-#ifdef HAS_PRINTENGINE
-#    include <qprintengine_win_p.h>
-#endif
-
-#include <QtGui/QPrinterInfo>
-
-#include <QtCore/QStringList>
-#include <QtCore/qt_windows.h>
-
-QT_BEGIN_NAMESPACE
-
-QPrintEngine *QWindowsPrinterSupport::createNativePrintEngine(QPrinter::PrinterMode mode)
-{
-#ifdef HAS_PRINTENGINE
-    return new QWin32PrintEngine(mode);
-#else
-    Q_UNUSED(mode);
-    Q_UNIMPLEMENTED();
-    return 0;
-#endif
-}
-
-QPaintEngine *QWindowsPrinterSupport::createPaintEngine(QPrintEngine *engine, QPrinter::PrinterMode)
-{
-#ifdef HAS_PRINTENGINE
-    return static_cast<QWin32PrintEngine *>(engine);
-#else
-    Q_UNIMPLEMENTED();
-    Q_UNUSED(engine);
-    return 0;
-#endif
-}
-
-QList<QPrinter::PaperSize> QWindowsPrinterSupport::supportedPaperSizes(const QPrinterInfo &printerInfo) const
-{
-    QList<QPrinter::PaperSize> paperSizes;
-    const QString printerName = printerInfo.printerName();
-    const wchar_t *nameUtf16 = reinterpret_cast<const wchar_t*>(printerName.utf16());
-    DWORD size = DeviceCapabilities(nameUtf16, NULL, DC_PAPERS, NULL, NULL);
-    if ((int)size != -1) {
-        wchar_t *papers = new wchar_t[size];
-        size = DeviceCapabilities(nameUtf16, NULL, DC_PAPERS, papers, NULL);
-#ifdef HAS_PRINTENGINE
-        for (int c = 0; c < (int)size; ++c)
-            paperSizes.append(mapDevmodePaperSize(papers[c]));
-#endif
-        delete [] papers;
-    }
-    return paperSizes;
-}
-
-QList<QPrinterInfo> QWindowsPrinterSupport::availablePrinters()
-{
-    QList<QPrinterInfo> printers;
-
-    DWORD needed = 0;
-    DWORD returned = 0;
-    if (!EnumPrinters(PRINTER_ENUM_LOCAL | PRINTER_ENUM_CONNECTIONS, NULL, 4, 0, 0, &needed, &returned)) {
-        LPBYTE buffer = new BYTE[needed];
-        if (EnumPrinters(PRINTER_ENUM_LOCAL | PRINTER_ENUM_CONNECTIONS, NULL, 4, buffer, needed, &needed, &returned)) {
-            PPRINTER_INFO_4 infoList = reinterpret_cast<PPRINTER_INFO_4>(buffer);
-            QPrinterInfo defPrn = defaultPrinter();
-            for (uint i = 0; i < returned; ++i) {
-                const QString printerName(QString::fromWCharArray(infoList[i].pPrinterName));
-                const bool isDefault = printerName == defPrn.printerName();
-                printers.append(QPlatformPrinterSupport::printerInfo(printerName,
-                                                                     isDefault));
-            }
-        }
-        delete [] buffer;
-    }
-
-    return printers;
-}
-
-QPrinterInfo QWindowsPrinterSupport::defaultPrinter()
-{
-    QString noPrinters(QStringLiteral("qt_no_printers"));
-    wchar_t buffer[256];
-    GetProfileString(L"windows", L"device", (wchar_t*)noPrinters.utf16(), buffer, 256);
-    QString output = QString::fromWCharArray(buffer);
-    if (output != noPrinters) {
-        // Filter out the name of the printer, which should be everything before a comma.
-        const QString printerName = output.split(QLatin1Char(',')).value(0);
-        return QPlatformPrinterSupport::printerInfo(printerName, true);
-    }
-
-    return QPrinterInfo();
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/platforms/windows/qwindowsprintersupport.h b/src/plugins/platforms/windows/qwindowsprintersupport.h
deleted file mode 100644
index c0a8190599..0000000000
--- a/src/plugins/platforms/windows/qwindowsprintersupport.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (info@qt.nokia.com)
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QWINDOWSPRINTERSUPPORT_H
-#define QWINDOWSPRINTERSUPPORT_H
-
-#include <QtGui/QPlatformPrinterSupport>
-
-QT_BEGIN_NAMESPACE
-
-class QWindowsPrinterSupport : public QPlatformPrinterSupport
-{
-public:
-    virtual QPrintEngine *createNativePrintEngine(QPrinter::PrinterMode);
-    virtual QPaintEngine *createPaintEngine(QPrintEngine *, QPrinter::PrinterMode);
-
-    virtual QList<QPrinter::PaperSize> supportedPaperSizes(const QPrinterInfo &) const;
-    virtual QPrinterInfo defaultPrinter();
-    virtual QList<QPrinterInfo> availablePrinters();
-};
-
-QT_END_NAMESPACE
-
-#endif // QWINDOWSPRINTERSUPPORT_H
diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro
index c9be003984..7e652f7418 100644
--- a/src/plugins/platforms/windows/windows.pro
+++ b/src/plugins/platforms/windows/windows.pro
@@ -27,7 +27,6 @@ SOURCES += \
     qwindowscontext.cpp \
     qwindowsbackingstore.cpp \
     qwindowsscreen.cpp \
-    qwindowsprintersupport.cpp \
     qwindowskeymapper.cpp \
     qwindowsfontengine.cpp \
     qwindowsfontdatabase.cpp \
@@ -48,7 +47,6 @@ HEADERS += \
     qwindowscontext.h \
     qwindowsbackingstore.h \
     qwindowsscreen.h \
-    qwindowsprintersupport.h \
     qwindowskeymapper.h \
     qwindowsfontengine.h \
     qwindowsfontdatabase.h \