diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-19 14:33:13 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-19 14:33:13 +0100 |
| commit | 97724fb418a507eea6b7c88857c1b300fd0d3515 (patch) | |
| tree | 60ab953c4d361d1795682a00c7fb7d483f734f8d /src/qml/doc | |
| parent | b7a1d6e041d98e9fb296fb7618c5a82f5b86a442 (diff) | |
| parent | 4d99e5bb809bffbbfd3fb5e6bad34afd991beb1e (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/qml/doc')
| -rw-r--r-- | src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc b/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc index 31a68d34fa..04b278106f 100644 --- a/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc +++ b/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc @@ -147,8 +147,8 @@ custom element \c PushButton with a \c buttonText property that internally reflects the value of a \c m_buttonText member variable. Modifying the member variable directly like this is not a good idea: -\badcode -// BAD! +\code +//bad code QQmlComponent component(engine, "MyButton.qml"); PushButton *button = qobject_cast<PushButton*>(component.create()); button->m_buttonText = "Click me"; |