diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-04 10:23:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-04 10:23:21 (GMT) |
| commit | 337dbd5391b4e2b1bd88918a46f3392df8fd1312 (patch) | |
| tree | 0f065124c11ffbec256924e36baee2ba1fc0e069 /doc/src/declarative/integrating.qdoc | |
| parent | ffa103af9620998f47c632f4118e789bf7f1cde7 (diff) | |
| parent | a5aadcea4c12c7926bf3b4d218ce476723cd7e10 (diff) | |
| download | Qt-337dbd5391b4e2b1bd88918a46f3392df8fd1312.zip Qt-337dbd5391b4e2b1bd88918a46f3392df8fd1312.tar.gz Qt-337dbd5391b4e2b1bd88918a46f3392df8fd1312.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: (74 commits)
Optimization for QDeclarativePaintedItem.
Update childrenRect when children are added or removed.
Optimize childrenRect.
Remove obsolete doc groupings.
Doc improvements
Remove QDeclarativeLoader::resizeMode
Don't create an anchors element so that we can check that there aren't any
Ensure eval and Function are in the correct scope
Add availableFonts.qml for fonts examples.
Add Qt.fontFamilies() method
Avoid regenerating PathView delegates needlessly
When a model delegate is released, remove it from the scene immediately.
Fix assignment of value types to javascript var.
More doc fixes
Make QDeclarativeParserStatus method pure virtual to encourage right code.
Doc fixes
Fix error string
Add QML value types for math3d types
Fix assert in qdeclarativepathview
Avoid divisions by zero in qdeclarativetimeline
...
Diffstat (limited to 'doc/src/declarative/integrating.qdoc')
| -rw-r--r-- | doc/src/declarative/integrating.qdoc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/declarative/integrating.qdoc b/doc/src/declarative/integrating.qdoc index 0051f09..1c07f8e 100644 --- a/doc/src/declarative/integrating.qdoc +++ b/doc/src/declarative/integrating.qdoc @@ -118,34 +118,34 @@ Here is an example. Suppose you have two classes, \c RedSquare and \c BlueCircle that both inherit from QGraphicsWidget: \c [graphicswidgets/redsquare.h] -\snippet doc/src/declarative/snippets/integrating/graphicswidgets/redsquare.h 0 +\snippet doc/src/snippets/declarative/graphicswidgets/redsquare.h 0 \c [graphicswidgets/bluecircle.h] -\snippet doc/src/declarative/snippets/integrating/graphicswidgets/bluecircle.h 0 +\snippet doc/src/snippets/declarative/graphicswidgets/bluecircle.h 0 Then, create a plugin by subclassing QDeclarativeExtensionPlugin, and register the types by calling qmlRegisterType(). Also export the plugin with Q_EXPORT_PLUGIN2. \c [graphicswidgets/shapesplugin.cpp] -\snippet doc/src/declarative/snippets/integrating/graphicswidgets/shapesplugin.cpp 0 +\snippet doc/src/snippets/declarative/graphicswidgets/shapesplugin.cpp 0 Now write a project file that creates the plugin: \c [graphicswidgets/graphicswidgets.pro] -\quotefile doc/src/declarative/snippets/integrating/graphicswidgets/graphicswidgets.pro +\quotefile doc/src/snippets/declarative/graphicswidgets/graphicswidgets.pro And add a \c qmldir file that includes the \c graphicswidgets plugin from the \c lib subdirectory (as defined in the project file): \c [graphicswidgets/qmldir] -\quotefile doc/src/declarative/snippets/integrating/graphicswidgets/qmldir +\quotefile doc/src/snippets/declarative/graphicswidgets/qmldir Now, we can write a QML file that uses the \c RedSquare and \c BlueCircle widgets. (As an example, we can also create \c QGraphicsWidget items if we import the \c Qt.widgets module.) \c [main.qml] -\quotefile doc/src/declarative/snippets/integrating/graphicswidgets/main.qml +\quotefile doc/src/snippets/declarative/graphicswidgets/main.qml Here is a screenshot of the result: |