summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-08-09 18:55:51 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-08-09 18:55:51 (GMT)
commit7f2540ad80f56ccb4d81b897d90581130e9b9e91 (patch)
tree1e1ff4c8f9846faddd58a8ff6d0810bdac7c6f20 /doc/src/snippets/code
parentf33359fb0c56fe88e0ae3c564b7847f90889eac2 (diff)
parent720f4ca0ec3b42a101ac24b2cf74cdc87d29eac9 (diff)
downloadQt-7f2540ad80f56ccb4d81b897d90581130e9b9e91.zip
Qt-7f2540ad80f56ccb4d81b897d90581130e9b9e91.tar.gz
Qt-7f2540ad80f56ccb4d81b897d90581130e9b9e91.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/getting-started/gettingstartedqml.qdoc
Diffstat (limited to 'doc/src/snippets/code')
-rw-r--r--doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp b/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp
index 088e043..0bd5fdf 100644
--- a/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp
+++ b/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp
@@ -87,14 +87,9 @@ void myFunction(bool useSubClass)
// is equivalent to:
const QScopedPointer<QWidget> p(new QWidget());
- QWidget *const p = new QWidget();
- // is equivalent to:
- const QScopedPointer<QWidget> p(new QWidget());
-
const QWidget *p = new QWidget();
// is equivalent to:
QScopedPointer<const QWidget> p(new QWidget());
-
//! [2]
//! [3]