diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-24 04:23:00 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-24 04:23:00 (GMT) |
| commit | bb1bdcab28e4c52dcea37dfaaa435045b1985eeb (patch) | |
| tree | 0f12ad5bca9d433001f717a1df69c723ba57fc71 | |
| parent | 435f6f842c116de641917d0b352f1c21cec666ee (diff) | |
| parent | 8391e67dce6011bc8b418125686a5a4699d5e2d8 (diff) | |
| download | Qt-bb1bdcab28e4c52dcea37dfaaa435045b1985eeb.zip Qt-bb1bdcab28e4c52dcea37dfaaa435045b1985eeb.tar.gz Qt-bb1bdcab28e4c52dcea37dfaaa435045b1985eeb.tar.bz2 | |
Merge branch 'kinetic-declarativeui-gv' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv
| -rw-r--r-- | src/declarative/fx/qfxitem.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/fx/qfxrepeater.cpp | 1 | ||||
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem_p.h | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp index 54e17e0..cd8cabd 100644 --- a/src/declarative/fx/qfxitem.cpp +++ b/src/declarative/fx/qfxitem.cpp @@ -2176,6 +2176,7 @@ QPointF QFxItem::transformOriginPoint() const void QFxItem::setFocus(bool focus) { + Q_UNUSED(focus) return; } @@ -2475,6 +2476,7 @@ bool QFxItem::activeFocusPanel() const void QFxItem::setActiveFocusPanel(bool b) { + Q_UNUSED(b) } bool QFxItem::hasActiveFocus() const diff --git a/src/declarative/fx/qfxrepeater.cpp b/src/declarative/fx/qfxrepeater.cpp index 3ed47cd..a4dc809 100644 --- a/src/declarative/fx/qfxrepeater.cpp +++ b/src/declarative/fx/qfxrepeater.cpp @@ -57,6 +57,7 @@ QFxRepeaterPrivate::~QFxRepeaterPrivate() QFxItem *QFxRepeaterPrivate::addItem(QmlContext *ctxt, QFxItem *lastItem) { + Q_UNUSED(lastItem) Q_Q(QFxRepeater); QObject *nobj = component->create(ctxt); QFxItem *item = qobject_cast<QFxItem *>(nobj); diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index 10e03de..83806c0 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -92,7 +92,7 @@ public: void purge(); }; -class Q_AUTOTEST_EXPORT QGraphicsItemPrivate +class Q_GUI_EXPORT QGraphicsItemPrivate { Q_DECLARE_PUBLIC(QGraphicsItem) public: |