diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-04-16 03:55:39 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-04-16 03:59:58 (GMT) |
| commit | 2913a71672a6cbe3022e167cf9d318beb2f29ee3 (patch) | |
| tree | a3fd610bd8ea569b69871edbca8d8eed86b561dc /src/gui | |
| parent | ac0fc4e9b0ed314e7d49e8dc0e9ded0922aab8e9 (diff) | |
| download | Qt-2913a71672a6cbe3022e167cf9d318beb2f29ee3.zip Qt-2913a71672a6cbe3022e167cf9d318beb2f29ee3.tar.gz Qt-2913a71672a6cbe3022e167cf9d318beb2f29ee3.tar.bz2 | |
Fix building of corelib, network and gui with qconfig minimal.
The bearer management code, which this bug is for, was fixed by MR 517
previously.
Task-number: QTBUG-9493
Reviewed-by: alex
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 4 | ||||
| -rw-r--r-- | src/gui/painting/qpaintbuffer.cpp | 2 | ||||
| -rw-r--r-- | src/gui/painting/qpaintbuffer_p.h | 2 | ||||
| -rw-r--r-- | src/gui/text/qstatictext.cpp | 2 |
4 files changed, 10 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 813cb95..62e99e9 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -186,9 +186,11 @@ QApplicationPrivate::QApplicationPrivate(int &argc, char **argv, QApplication::T gestureManager = 0; gestureWidget = 0; +#if defined(Q_WS_X11) || defined(Q_WS_WIN) move_cursor = 0; copy_cursor = 0; link_cursor = 0; +#endif #if defined(Q_WS_WIN) ignore_cursor = 0; #endif @@ -1043,9 +1045,11 @@ QApplication::~QApplication() qt_clipboard = 0; #endif +#if defined(Q_WS_X11) || defined(Q_WS_WIN) delete d->move_cursor; d->move_cursor = 0; delete d->copy_cursor; d->copy_cursor = 0; delete d->link_cursor; d->link_cursor = 0; +#endif #if defined(Q_WS_WIN) delete d->ignore_cursor; d->ignore_cursor = 0; #endif diff --git a/src/gui/painting/qpaintbuffer.cpp b/src/gui/painting/qpaintbuffer.cpp index e1156dc..9077eba 100644 --- a/src/gui/painting/qpaintbuffer.cpp +++ b/src/gui/painting/qpaintbuffer.cpp @@ -312,6 +312,7 @@ int QPaintBuffer::processCommands(QPainter *painter, int begin, int end) const return depth; } +#ifndef QT_NO_DEBUG_STREAM QString QPaintBuffer::commandDescription(int command) const { QString desc; @@ -563,6 +564,7 @@ QString QPaintBuffer::commandDescription(int command) const return desc; } +#endif QRectF QPaintBuffer::boundingRect() const { diff --git a/src/gui/painting/qpaintbuffer_p.h b/src/gui/painting/qpaintbuffer_p.h index 4576947..e4fe4bf 100644 --- a/src/gui/painting/qpaintbuffer_p.h +++ b/src/gui/painting/qpaintbuffer_p.h @@ -82,7 +82,9 @@ public: int frameStartIndex(int frame) const; int frameEndIndex(int frame) const; int processCommands(QPainter *painter, int begin, int end) const; +#ifndef QT_NO_DEBUG_STREAM QString commandDescription(int command) const; +#endif void setBoundingRect(const QRectF &rect); QRectF boundingRect() const; diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp index 06b0d3b..8027389 100644 --- a/src/gui/text/qstatictext.cpp +++ b/src/gui/text/qstatictext.cpp @@ -584,11 +584,13 @@ void QStaticTextPrivate::paintText(const QPointF &topLeftPosition, QPainter *p) textLayout.draw(p, topLeftPosition); } else { QTextDocument document; +#ifndef QT_NO_CSSPARSER QColor color = p->pen().color(); document.setDefaultStyleSheet(QString::fromLatin1("body { color: #%1%2%3 }") .arg(QString::number(color.red(), 16), 2, QLatin1Char('0')) .arg(QString::number(color.green(), 16), 2, QLatin1Char('0')) .arg(QString::number(color.blue(), 16), 2, QLatin1Char('0'))); +#endif document.setDefaultFont(font); document.setDocumentMargin(0.0); if (textWidth >= 0.0) |