diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-13 23:05:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-13 23:05:26 (GMT) |
| commit | a5e9e86a6daddde6fb906cbf09bf562e50b17698 (patch) | |
| tree | 18e1fbc22574ae2168500349a04f758d91a37c8e /doc/src | |
| parent | c46c06d363b7c90fecd84e7ef333ffa449f1d71c (diff) | |
| parent | a15c2d6ba9c2da1c709fbb23d0c07ad51450d93e (diff) | |
| download | Qt-a5e9e86a6daddde6fb906cbf09bf562e50b17698.zip Qt-a5e9e86a6daddde6fb906cbf09bf562e50b17698.tar.gz Qt-a5e9e86a6daddde6fb906cbf09bf562e50b17698.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: (26 commits)
Remove warning on ASCII cast
Fix compilation on Solaris, AIX and HP-UX.
Speed up borderimage test.
Exclude webview examples when compiled without webview
Fix test
Use SRCDIR to make examples test work with shadow builds.
Example fixes
Improve efficiency of model dataChanged.
Optimize some autotests
Fix test (run with -qws on QWS).
Stabilize behaviors test.
Struct -> class because class is better.
Move effect property where it should be.
Tweak tests to run in parallel
Network-related test fails on the rare occasion
Fix code style in examples
Make demo code more consistent with example code in terms of variable
Fix score from previous change
Doc improvements
Fix example code style
...
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/declarative/advtutorial.qdoc | 3 | ||||
| -rw-r--r-- | doc/src/declarative/qtbinding.qdoc | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/src/declarative/advtutorial.qdoc b/doc/src/declarative/advtutorial.qdoc index 4807fd2..3a70eee 100644 --- a/doc/src/declarative/advtutorial.qdoc +++ b/doc/src/declarative/advtutorial.qdoc @@ -101,6 +101,9 @@ One item you may not recognize here is the \l SystemPalette item. This provides access to the Qt system palette and is used to give the button a more native look-and-feel. +Notice the anchors for the \c Item, \c Button and \c Text elements are set using +\l {Grouped Properties}{group notation} for readability. + \section2 Adding \c Button and \c Block components The \c Button item in the code above is defined in a separate file named \c Button.qml. diff --git a/doc/src/declarative/qtbinding.qdoc b/doc/src/declarative/qtbinding.qdoc index 181c504..fa0d13c 100644 --- a/doc/src/declarative/qtbinding.qdoc +++ b/doc/src/declarative/qtbinding.qdoc @@ -74,7 +74,7 @@ an example of loading a QML document, and creating an object from it. \code QDeclarativeEngine *engine = new QDeclarativeEngine(parent); -QDeclarativeComponent component(engine, QUrl("main.qml")); +QDeclarativeComponent component(engine, QUrl::fromLocalFile("main.qml")); QObject *myObject = component.create(); \endcode |