diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-17 11:52:35 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-17 11:52:35 (GMT) |
commit | cca7c5b40751e2192ba2c7c7422557eeb5672a17 (patch) | |
tree | dbff65640557790393937cc982d22a54213f3b6f /doc | |
parent | 0f8c867b1d5b13a56bd80f1819d4e71a9865b493 (diff) | |
parent | 1f475f97bfaef06967c2325c4ecf7fb076e5a1fc (diff) | |
download | Qt-cca7c5b40751e2192ba2c7c7422557eeb5672a17.zip Qt-cca7c5b40751e2192ba2c7c7422557eeb5672a17.tar.gz Qt-cca7c5b40751e2192ba2c7c7422557eeb5672a17.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix license text.
Doc: fix a typo in QML/Qt UI integration
Diffstat (limited to 'doc')
-rw-r--r-- | doc/src/declarative/integrating.qdoc | 2 | ||||
-rw-r--r-- | doc/src/declarative/whatsnew.qdoc | 10 | ||||
-rw-r--r-- | doc/src/snippets/code/doc_src_fdl.qdoc | 10 |
3 files changed, 11 insertions, 11 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 diff --git a/doc/src/snippets/code/doc_src_fdl.qdoc b/doc/src/snippets/code/doc_src_fdl.qdoc index 3c15dfe..b55e663 100644 --- a/doc/src/snippets/code/doc_src_fdl.qdoc +++ b/doc/src/snippets/code/doc_src_fdl.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 |