diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-04-11 14:56:22 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-04-11 16:05:03 +0200 |
| commit | a896d4b39ec3d45ba708d9b36ea9c864b1df2136 (patch) | |
| tree | 45cfe153cce6114c2c76c48dc0bdabde2a8cf3e3 /examples/quick/accessibility/accessibility.qml | |
| parent | 24fb8dc27eddfdd62bd2c3a6e863cbf433762cd6 (diff) | |
| parent | 65bfc35429e845cf6b76d58107360a1360a654fc (diff) | |
Merge remote-tracking branch 'origin/master' into api_changes
Conflicts:
src/qml/debugger/qqmlprofilerservice_p.h
src/qml/qml/qqmlboundsignal.cpp
src/qml/qml/v4/qv4bindings.cpp
src/quick/items/qquickshadereffect.cpp
src/quick/particles/qquickcustomparticle.cpp
src/quick/qtquick2.cpp
Change-Id: Ia9c6517035ae912fa75e77473a452bd3383def56
Diffstat (limited to 'examples/quick/accessibility/accessibility.qml')
| -rw-r--r-- | examples/quick/accessibility/accessibility.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/quick/accessibility/accessibility.qml b/examples/quick/accessibility/accessibility.qml index e987561bb1..5e4b0f8dcd 100644 --- a/examples/quick/accessibility/accessibility.qml +++ b/examples/quick/accessibility/accessibility.qml @@ -44,7 +44,7 @@ import "content" /*! \title QtQuick Examples - Accessibility - \example qtquick/accessibility + \example quick/accessibility \brief This example has accessible buttons. */ |