diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-17 09:32:45 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-17 09:32:45 (GMT) |
| commit | 94a3356d5eb7b255d439efe2699bf3a9b025e8eb (patch) | |
| tree | 49bdb24dde6e2cc6bc4d5c63281498c6b757ddeb /src/declarative/util/qdeclarativepackage.cpp | |
| parent | bdbe09ad2c01ae11d10511b51f8d7a3dfb27b17c (diff) | |
| parent | 1db36a5a37dcca0e24ada3c852f2647ab2330eee (diff) | |
| download | Qt-94a3356d5eb7b255d439efe2699bf3a9b025e8eb.zip Qt-94a3356d5eb7b255d439efe2699bf3a9b025e8eb.tar.gz Qt-94a3356d5eb7b255d439efe2699bf3a9b025e8eb.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Move xmldata example into rssnews demo.
Move Q_ENUMS to start of class declaration
Restructure QDeclarativeAbstractBinding destructor
Don't call pure virtual method in ~QDeclarativeAbstractBinding()
Fix examples autotest when compiled without webkit or xmlpatterns
Check for acquireReg() failure
Focus should be applied to focus scopes all the way up the chain, not
Add focus docs snippets
Fix doc for status, add Image::onLoaded.
Don't crash due to recursive positioning.
ListModel::get() shouldn't print warnings for invalid indices since it
Add \brief to TextInput
Add missing .pro
Restructure the examples. They are now organized into various
graphicsWidgets doc example was previously removed
Doc fix
Add a "priority" property to Keys and KeyNavigation
Diffstat (limited to 'src/declarative/util/qdeclarativepackage.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativepackage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativepackage.cpp b/src/declarative/util/qdeclarativepackage.cpp index 20e9907..9617b86 100644 --- a/src/declarative/util/qdeclarativepackage.cpp +++ b/src/declarative/util/qdeclarativepackage.cpp @@ -62,13 +62,13 @@ QT_BEGIN_NAMESPACE delegate it should appear in. This allows an item to move between views. - \snippet examples/declarative/package/Delegate.qml 0 + \snippet examples/declarative/modelviews/package/Delegate.qml 0 These named items are used as the delegates by the two views who reference the special VisualDataModel.parts property to select a model which provides the chosen delegate. - \snippet examples/declarative/package/view.qml 0 + \snippet examples/declarative/modelviews/package/view.qml 0 \sa QtDeclarative */ |