summaryrefslogtreecommitdiffstats
path: root/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport.cpp
diff options
context:
space:
mode:
authorJohn Layt <jlayt@kde.org>2012-05-09 23:47:14 +0100
committerQt by Nokia <qt-info@nokia.com>2012-05-31 17:40:55 +0200
commitf70924e9ccc016b979bc74bba156600639184be7 (patch)
treea470d6ac093035526cbc3840e0588d33c003e05f /src/platformsupport/printersupport/genericunix/qgenericunixprintersupport.cpp
parent704bd686315deeaf86a15d1eb37af56b0b0e184b (diff)
QtPrintSupport: Add CUPS printsupport plugin
Move CUPS code around to create a new CUPS printsupport plugin, this fixes QPrinterInfo for CUPS which depends on the plugin to work. It QT_NO_CUPS is defined then the plugin is not built and only Print to PDF is supported under Linux. * Move unused genericiunixprintersupport plugin to start new CUPS printsupport plugin * Split QPdfPrintEngine to create QCupsPrintEngine * Remove LPR related code from QPdfPrintEngine * Move CUPS specific code from plugin base class to derived CUPS class * Remove forcing CUPS print engine to use PDF mode as PDF is now Native * Move qt_getCupsPrinterPaperSizes from qprinterinfo_unix to QCUPSSupport * Remove qprinterinfo_unix as no longer used * Remove all QT_NO_LPR uses There is now no CUPS specific code left in printsupport/kernel except QCUPSSupport which is needed for the dialogs. Task-number: QTBUG-23060 Change-Id: Ie8fa4512a2424edc8943068e0fa9fb714cc42db9 Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: John Layt <jlayt@kde.org>
Diffstat (limited to 'src/platformsupport/printersupport/genericunix/qgenericunixprintersupport.cpp')
-rw-r--r--src/platformsupport/printersupport/genericunix/qgenericunixprintersupport.cpp71
1 files changed, 0 insertions, 71 deletions
diff --git a/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport.cpp b/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport.cpp
deleted file mode 100644
index 2fb9562545..0000000000
--- a/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** 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 "qgenericunixprintersupport_p.h"
-
-#include <QtPrintSupport/QPrinterInfo>
-#include <private/qcups_p.h>
-
-QT_BEGIN_NAMESPACE
-
-QList<QPrinter::PaperSize> QGenericUnixPrinterSupport::supportedPaperSizes(const QPrinterInfo &printerInfo) const
-{
-#ifndef QT_NO_CUPS
- return QCUPSSupport::getCupsPrinterPaperSizes(QPlatformPrinterSupport::printerInfoCupsPrinterIndex(printerInfo));
-#else
- return QList<QPrinter::PaperSize>();
-#endif
-}
-
-QList<QPrinterInfo> QGenericUnixPrinterSupport::availablePrinters()
-{
- QList<QPrinterInfo> printers;
-#ifndef QT_NO_CUPS
- foreach (const QCUPSSupport::Printer &p, QCUPSSupport::availableUnixPrinters()) {
- QPrinterInfo printer(QPlatformPrinterSupport::printerInfo(p.name, p.isDefault));
- QPlatformPrinterSupport::setPrinterInfoCupsPrinterIndex(&printer, p.cupsPrinterIndex);
- printers.append(printer);
- }
-#endif
- return printers;
-}
-
-QT_END_NAMESPACE