diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-05 06:26:24 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-05 06:26:24 (GMT) |
| commit | ee88b2d8408396188eb2ce52d740c395c6cd4656 (patch) | |
| tree | 1f59ea0612fecbaca595594d3812dd2aab64cf63 /src/gui/image/qicon.cpp | |
| parent | 673973acc20ce4e068d63fa5b0391f5c785be8a3 (diff) | |
| parent | aa58293b57a05cd52b36ba14a05958dceb65c603 (diff) | |
| download | Qt-ee88b2d8408396188eb2ce52d740c395c6cd4656.zip Qt-ee88b2d8408396188eb2ce52d740c395c6cd4656.tar.gz Qt-ee88b2d8408396188eb2ce52d740c395c6cd4656.tar.bz2 | |
Merge remote branch 'qt-official/4.6' into 4.6
Diffstat (limited to 'src/gui/image/qicon.cpp')
| -rw-r--r-- | src/gui/image/qicon.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp index e0779a0..cff9cd2 100644 --- a/src/gui/image/qicon.cpp +++ b/src/gui/image/qicon.cpp @@ -66,6 +66,7 @@ #include "private/qkde_p.h" #endif +#ifndef QT_NO_ICON QT_BEGIN_NAMESPACE /*! @@ -1217,3 +1218,4 @@ QSize QIcon::pixmapSize(Size which) */ QT_END_NAMESPACE +#endif //QT_NO_ICON |