diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-06-10 14:58:17 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-06-10 14:58:17 (GMT) |
| commit | c3d2c4a7d103ec1289c27425f49f8565a7f4413c (patch) | |
| tree | ab77725bf74da5632bc5e9f7492a12759c1dfeaa /demos | |
| parent | 0141b9b410278e064f3455d20cb21a50c926a2c8 (diff) | |
| parent | 32f32ee3e752a6cc03505ddaa48d2849eaedc2a6 (diff) | |
| download | Qt-c3d2c4a7d103ec1289c27425f49f8565a7f4413c.zip Qt-c3d2c4a7d103ec1289c27425f49f8565a7f4413c.tar.gz Qt-c3d2c4a7d103ec1289c27425f49f8565a7f4413c.tar.bz2 | |
Merge commit 'qt/master' into kinetic-declarativeui
Conflicts:
src/corelib/kernel/qabstractitemmodel.cpp
src/corelib/kernel/qobject.cpp
tools/qdoc3/htmlgenerator.cpp
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/embeddeddialogs/main.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/demos/embeddeddialogs/main.cpp b/demos/embeddeddialogs/main.cpp index cfb31c4..c9b6ee1 100644 --- a/demos/embeddeddialogs/main.cpp +++ b/demos/embeddeddialogs/main.cpp @@ -76,7 +76,6 @@ int main(int argc, char *argv[]) view.scale(0.5, 0.5); view.setRenderHints(view.renderHints() | QPainter::Antialiasing | QPainter::SmoothPixmapTransform); view.setBackgroundBrush(QPixmap(":/No-Ones-Laughing-3.jpg")); - view.setCacheMode(QGraphicsView::CacheBackground); view.setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate); view.show(); view.setWindowTitle("Embedded Dialogs Demo"); |