summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorJan-Arve Sæther <jan-arve.saether@nokia.com>2009-12-01 12:31:51 (GMT)
committerJan-Arve Sæther <jan-arve.saether@nokia.com>2009-12-01 12:31:51 (GMT)
commit0335a82c1e8b006ad123bddb012ee354a41b727a (patch)
treeac93e25c974b8f2af03aee2817837512050b54d8 /examples
parent1d5621a4958ab6f250566c26f891d3e99c6f8585 (diff)
parent89e26da4374563c9419da1357a24cf9618d804d6 (diff)
downloadQt-0335a82c1e8b006ad123bddb012ee354a41b727a.zip
Qt-0335a82c1e8b006ad123bddb012ee354a41b727a.tar.gz
Qt-0335a82c1e8b006ad123bddb012ee354a41b727a.tar.bz2
Merge branch 'ooo-sequential' of git://gitorious.org/~fleury/qt/fleury-openbossa-clone into fleury-ooo-sequential
Conflicts: tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
Diffstat (limited to 'examples')
-rw-r--r--examples/graphicsview/anchorlayout/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/graphicsview/anchorlayout/main.cpp b/examples/graphicsview/anchorlayout/main.cpp
index f898d1d..389bc9e 100644
--- a/examples/graphicsview/anchorlayout/main.cpp
+++ b/examples/graphicsview/anchorlayout/main.cpp
@@ -122,8 +122,8 @@ int main(int argc, char **argv)
scene.addItem(w);
scene.setBackgroundBrush(Qt::darkGreen);
- QGraphicsView *view = new QGraphicsView(&scene);
- view->show();
+ QGraphicsView view(&scene);
+ view.show();
return app.exec();
}