summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative
diff options
context:
space:
mode:
authorA-Team <ateam@pad.test.qt.nokia.com>2010-11-17 23:00:11 (GMT)
committerA-Team <ateam@pad.test.qt.nokia.com>2010-11-17 23:00:11 (GMT)
commit755313173cef5e61d823337bf4aca2807a98769f (patch)
tree479268b2cf9f840c8afc8b2997bda236064e1c20 /doc/src/declarative
parent88c2e6f8f9f968c6bfe4ca0c0e3e54365a3e0c82 (diff)
parentcca7c5b40751e2192ba2c7c7422557eeb5672a17 (diff)
downloadQt-755313173cef5e61d823337bf4aca2807a98769f.zip
Qt-755313173cef5e61d823337bf4aca2807a98769f.tar.gz
Qt-755313173cef5e61d823337bf4aca2807a98769f.tar.bz2
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'doc/src/declarative')
-rw-r--r--doc/src/declarative/integrating.qdoc2
-rw-r--r--doc/src/declarative/whatsnew.qdoc10
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/declarative/integrating.qdoc b/doc/src/declarative/integrating.qdoc
index 682f792..7028585 100644
--- a/doc/src/declarative/integrating.qdoc
+++ b/doc/src/declarative/integrating.qdoc
@@ -47,7 +47,7 @@ qmlView->setSource(QUrl::fromLocalFile("myqml.qml"));
QWidget *widget = myExistingWidget();
QVBoxLayout *layout = new QVBoxLayout(widget);
-widget->addWidget(qmlView);
+layout->addWidget(qmlView);
\endcode
The one drawback to this approach is that QDeclarativeView is slower to initialize
diff --git a/doc/src/declarative/whatsnew.qdoc b/doc/src/declarative/whatsnew.qdoc
index f8d1d0e..df0e999 100644
--- a/doc/src/declarative/whatsnew.qdoc
+++ b/doc/src/declarative/whatsnew.qdoc
@@ -7,11 +7,11 @@
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:FDL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in a
-** written agreement between you and Nokia.
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
**
** GNU Free Documentation License
** Alternatively, this file may be used under the terms of the GNU Free