diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2010-04-13 11:21:15 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-04-15 11:05:18 (GMT) |
| commit | 63224660526b199eabd08e1dfbd8956e764d768e (patch) | |
| tree | 236836b6e468bb65173bb8c0120a5fbd24ecbaad /src/gui/kernel/qapplication.cpp | |
| parent | 794cbd5800a4428babc100528fd4fdba49557b6f (diff) | |
| download | Qt-63224660526b199eabd08e1dfbd8956e764d768e.zip Qt-63224660526b199eabd08e1dfbd8956e764d768e.tar.gz Qt-63224660526b199eabd08e1dfbd8956e764d768e.tar.bz2 | |
Fix compile error with QT_NO_IMAGEFORMAT_XPM in QtGui
Merge-request: 2327
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
Diffstat (limited to 'src/gui/kernel/qapplication.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index b0a23d4..62e99e9 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -5936,6 +5936,7 @@ static const char * const link_xpm[] = { QPixmap QApplicationPrivate::getPixmapCursor(Qt::CursorShape cshape) { +#if defined(Q_WS_X11) || defined(Q_WS_WIN) if (!move_cursor) { move_cursor = new QPixmap((const char **)move_xpm); copy_cursor = new QPixmap((const char **)copy_xpm); @@ -5959,6 +5960,7 @@ QPixmap QApplicationPrivate::getPixmapCursor(Qt::CursorShape cshape) default: break; } +#endif return QPixmap(); } |