Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-st…
…aging into qtquick2
  • Loading branch information
Gunnar Sletta committed May 4, 2011
2 parents 280242a + 1b7c1b6 commit 16f5828
Show file tree
Hide file tree
Showing 43 changed files with 684 additions and 391 deletions.
6 changes: 6 additions & 0 deletions doc/src/declarative/whatsnew.qdoc
Expand Up @@ -29,6 +29,12 @@
\title What's new in Qt Quick
\page qtquick-whatsnew.html

\section1 Qt 5.0.0 includes QtQuick 2.0

QtQuick 2.0 is a major update.

MouseArea now propagates clicked, doubleClicked and pressAndHold differently.

\section1 Qt 4.7.4 includes QtQuick 1.1

QtQuick 1.1 is a minor feature update. \e {import QtQuick 1.1} to use the new features.
Expand Down
5 changes: 5 additions & 0 deletions examples/declarative/painteditem/main.cpp
Expand Up @@ -47,6 +47,11 @@ class MyPaintItem : public QSGPaintedItem
{
Q_OBJECT
public:
MyPaintItem() : QSGPaintedItem()
{
setAntialiasing(true);
}

virtual void paint(QPainter *p)
{
QRectF rect(0, 0, width(), height());
Expand Down
1 change: 1 addition & 0 deletions examples/declarative/particles/allsmiles/smilefactory.qml
Expand Up @@ -51,6 +51,7 @@ Rectangle{
particles: ["goingLeft", "goingRight"]
image: "content/singlesmile.png"
rotation: 90
rotationSpeed: 90
autoRotation: true
}
DeformableParticle{
Expand Down

0 comments on commit 16f5828

Please sign in to comment.