diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2010-10-06 11:45:24 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2010-10-06 11:45:24 (GMT) |
| commit | d20d4837b4ed27f786b5b181ebd003e5274cffae (patch) | |
| tree | 1a254718931fe10bdf060490243a769956fcc797 | |
| parent | 64b2aba90b86a62be961dc7fc77aa6b37915e144 (diff) | |
| parent | eaef6f8b4a7ad637a59b4fe2ec623d26a7cae96f (diff) | |
| download | Qt-d20d4837b4ed27f786b5b181ebd003e5274cffae.zip Qt-d20d4837b4ed27f786b5b181ebd003e5274cffae.tar.gz Qt-d20d4837b4ed27f786b5b181ebd003e5274cffae.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
| -rw-r--r-- | doc/src/getting-started/gettingstartedqml.qdoc | 2 | ||||
| -rwxr-xr-x | doc/src/template/style/style.css | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/getting-started/gettingstartedqml.qdoc b/doc/src/getting-started/gettingstartedqml.qdoc index 0da8f53..0ebb448 100644 --- a/doc/src/getting-started/gettingstartedqml.qdoc +++ b/doc/src/getting-started/gettingstartedqml.qdoc @@ -81,7 +81,7 @@ In QML, the basic visual item is the \l {Rectangle}{Rectangle} element. The \c Rectangle element has properties to control the element's appearance and location. - \snippet examples/tutorials/gettingStarted/gsQml/part0/Button.qml document + \snippet examples/tutorials/gettingStarted/gsQml/core/Button.qml document First, the \c { import QtQuick 1.0 } allows the qmlviewer tool to import the QML elements we will later use. This line must exist for every QML file. Notice that the version diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css index c07385c..3dcea96 100755 --- a/doc/src/template/style/style.css +++ b/doc/src/template/style/style.css @@ -982,7 +982,7 @@ min-width:250px; line-height: 1.2; min-width:100%; - + min-height:15px; } .flowList dd a{ |