diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-09 23:12:48 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-09 23:12:48 (GMT) |
| commit | 858e01e954ac9f3203ada6b61b47c418cc4b0a82 (patch) | |
| tree | 80116a18d608b5be90e728cf9698b34651fda1d5 /src/declarative/graphicsitems | |
| parent | 7f2836aba3334dc4c9da5cc5f57889c11a2bd85c (diff) | |
| parent | 40c018c7a0c8e95fcf928a6c1ce5301f16ffa5e3 (diff) | |
| download | Qt-858e01e954ac9f3203ada6b61b47c418cc4b0a82.zip Qt-858e01e954ac9f3203ada6b61b47c418cc4b0a82.tar.gz Qt-858e01e954ac9f3203ada6b61b47c418cc4b0a82.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/graphicsitems')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeitem_p.h | 4 | ||||
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeparticles.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeitem_p.h b/src/declarative/graphicsitems/qdeclarativeitem_p.h index 76ebcb4..55df063 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem_p.h +++ b/src/declarative/graphicsitems/qdeclarativeitem_p.h @@ -101,7 +101,7 @@ private: qreal m_height; }; -class QDeclarativeItemPrivate : public QGraphicsItemPrivate +class Q_DECLARATIVE_EXPORT QDeclarativeItemPrivate : public QGraphicsItemPrivate { Q_DECLARE_PUBLIC(QDeclarativeItem) @@ -259,7 +259,7 @@ public: static int consistentTime; static QTime currentTime(); - static void Q_DECLARATIVE_EXPORT setConsistentTime(int t); + static void setConsistentTime(int t); static void start(QTime &); static int elapsed(QTime &); static int restart(QTime &); diff --git a/src/declarative/graphicsitems/qdeclarativeparticles.cpp b/src/declarative/graphicsitems/qdeclarativeparticles.cpp index ec0bf6c..593c80a 100644 --- a/src/declarative/graphicsitems/qdeclarativeparticles.cpp +++ b/src/declarative/graphicsitems/qdeclarativeparticles.cpp @@ -1263,7 +1263,7 @@ void QDeclarativeParticlesPainter::paint(QPainter *p, const QStyleOptionGraphics const int myY = y() + parentItem()->y(); #if (QT_VERSION >= QT_VERSION_CHECK(4,7,0)) - QVarLengthArray<QPainter::Fragment, 256> pixmapData; + QVarLengthArray<QPainter::PixmapFragment, 256> pixmapData; #else QVarLengthArray<QDrawPixmaps::Data, 256> pixmapData; #endif |