diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-10-06 22:38:59 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-10-06 22:38:59 (GMT) |
| commit | 101184ea92171c303d240917f34815730a5e9fab (patch) | |
| tree | e265a681a4146f00878cb3a9b6297f6b8b6e0a95 /examples | |
| parent | 396a06a52a0f00639c9e528caf80ae2294e80bd2 (diff) | |
| parent | 2d2b4e8a77a30449d8b4ebc88979b3aff45a8222 (diff) | |
| download | Qt-101184ea92171c303d240917f34815730a5e9fab.zip Qt-101184ea92171c303d240917f34815730a5e9fab.tar.gz Qt-101184ea92171c303d240917f34815730a5e9fab.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/opengl/pbuffers/cube.h | 6 | ||||
| -rw-r--r-- | examples/painting/basicdrawing/renderarea.cpp | 5 | ||||
| -rw-r--r-- | examples/symbianpkgrules.pri | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/examples/opengl/pbuffers/cube.h b/examples/opengl/pbuffers/cube.h index 1974f4f..c882f1f 100644 --- a/examples/opengl/pbuffers/cube.h +++ b/examples/opengl/pbuffers/cube.h @@ -109,9 +109,9 @@ protected: class Cube : public QObject, public Tile { Q_OBJECT - Q_PROPERTY(qreal range READ range WRITE setRange); - Q_PROPERTY(qreal altitude READ altitude WRITE setAltitude); - Q_PROPERTY(qreal rotation READ rotation WRITE setRotation); + Q_PROPERTY(qreal range READ range WRITE setRange) + Q_PROPERTY(qreal altitude READ altitude WRITE setAltitude) + Q_PROPERTY(qreal rotation READ rotation WRITE setRotation) public: Cube(const QVector3D &loc = QVector3D()); ~Cube(); diff --git a/examples/painting/basicdrawing/renderarea.cpp b/examples/painting/basicdrawing/renderarea.cpp index e8222af..4f07a2d 100644 --- a/examples/painting/basicdrawing/renderarea.cpp +++ b/examples/painting/basicdrawing/renderarea.cpp @@ -136,11 +136,9 @@ void RenderArea::paintEvent(QPaintEvent * /* event */) QPainter painter(this); painter.setPen(pen); painter.setBrush(brush); - if (antialiased) { + if (antialiased) painter.setRenderHint(QPainter::Antialiasing, true); //! [9] - painter.translate(+0.5, +0.5); - } //! [10] for (int x = 0; x < width(); x += 100) { @@ -202,6 +200,7 @@ void RenderArea::paintEvent(QPaintEvent * /* event */) } } + painter.setRenderHint(QPainter::Antialiasing, false); painter.setPen(palette().dark().color()); painter.setBrush(Qt::NoBrush); painter.drawRect(QRect(0, 0, width() - 1, height() - 1)); diff --git a/examples/symbianpkgrules.pri b/examples/symbianpkgrules.pri index 069a16e..59c5480 100644 --- a/examples/symbianpkgrules.pri +++ b/examples/symbianpkgrules.pri @@ -11,5 +11,3 @@ vendorinfo = \ " " default_deployment.pkg_prerules += vendorinfo - -!isEmpty(TARGET.UID3):ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg |