From 1ba8abce0d731d1b30b05b8c055009c0d6a3aae5 Mon Sep 17 00:00:00 2001 From: nds Date: Tue, 22 Apr 2008 14:29:20 +0000 Subject: [PATCH] Appends definition of QT_NO_CUPS. Improvement for Suse-32 platform, which hasn't setting of cup product by default. --- src/Plot2d/Plot2d_ViewWindow.cxx | 2 +- src/Qtx/Qtx.cxx | 4 ++-- src/SUIT/SUIT_ViewWindow.cxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Plot2d/Plot2d_ViewWindow.cxx b/src/Plot2d/Plot2d_ViewWindow.cxx index 2d8f3d9df..0cde75a62 100755 --- a/src/Plot2d/Plot2d_ViewWindow.cxx +++ b/src/Plot2d/Plot2d_ViewWindow.cxx @@ -637,7 +637,7 @@ void Plot2d_ViewWindow::onPrintView() if ( !myViewFrame ) return; -#ifndef WIN32 +#if !defined(WIN32) && !defined(QT_NO_CUPS) #if QT_VERSION < 0x040303 if ( !Qtx::hasAnyPrinters() ) { SUIT_MessageBox::warning( this, tr( "WRN_WARNING" ), diff --git a/src/Qtx/Qtx.cxx b/src/Qtx/Qtx.cxx index a5d77d034..11b6166a4 100755 --- a/src/Qtx/Qtx.cxx +++ b/src/Qtx/Qtx.cxx @@ -1263,7 +1263,7 @@ bool Qtx::stringToConicalGradient( const QString& str, QConicalGradient& gradien * Cheque for existing any system printers */ -#ifndef WIN32 +#if !defined(WIN32) && !defined(QT_NO_CUPS) #if QT_VERSION < 0x040303 #include #include @@ -1275,7 +1275,7 @@ static CupsGetDests _cupsGetDests = 0; bool Qtx::hasAnyPrinters() { bool aRes = true; -#ifndef WIN32 +#if !defined(WIN32) && !defined(QT_NO_CUPS) #if QT_VERSION < 0x040303 QLibrary aCupsLib( QString( "cups" ) ); if ( !aCupsLib.load() ) diff --git a/src/SUIT/SUIT_ViewWindow.cxx b/src/SUIT/SUIT_ViewWindow.cxx index 9cde13e92..ca584e2a8 100755 --- a/src/SUIT/SUIT_ViewWindow.cxx +++ b/src/SUIT/SUIT_ViewWindow.cxx @@ -229,7 +229,7 @@ void SUIT_ViewWindow::printImage( const QImage& theImage, QWidget* theWidget ) if ( theImage.isNull() ) return; -#ifndef WIN32 +#if !defined(WIN32) && !defined(QT_NO_CUPS) #if QT_VERSION < 0x040303 if ( !Qtx::hasAnyPrinters() ) { SUIT_MessageBox::warning( this, tr( "WRN_WARNING" ), -- 2.39.2