From: vsr <vsr@opencascade.com>
Date: Tue, 31 Jul 2007 10:38:12 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: qt4_porting_delivery_220807~64
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b418173eae3395127b38953640d72daca4d1c63b;p=modules%2Fgui.git

*** empty log message ***
---

diff --git a/src/Qtx/Qtx.cxx b/src/Qtx/Qtx.cxx
index 89d87060d..be51ce08a 100755
--- a/src/Qtx/Qtx.cxx
+++ b/src/Qtx/Qtx.cxx
@@ -700,7 +700,7 @@ QPixmap Qtx::scaleIcon( const QPixmap& icon, const unsigned w, const unsigned h
 {
   QPixmap p;
   int aw = w, ah = h <= 0 ? w : h;
-  if ( p.isNull() || aw <= 0 || ah <= 0 || aw == icon.width() && ah == icon.height() )
+  if ( icon.isNull() || aw <= 0 || ah <= 0 || aw == icon.width() && ah == icon.height() )
     p = icon;
   else
     p = icon.fromImage( icon.toImage().scaled( aw, ah, Qt::KeepAspectRatio, Qt::SmoothTransformation ) );