diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-04-24 04:29:31 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-04-24 04:29:31 (GMT) |
| commit | 0c5f0baa59ae56749707c9f73754132cd9b4a44d (patch) | |
| tree | cc8e8ca8d889a64ee5cdaa91647b2cf221c8edf3 /src/declarative/fx/qfxcontentwrapper.cpp | |
| parent | 363265d790c9f6b69d5a706209b28e467de3a2d6 (diff) | |
| parent | db815819dae525c64575de38b92afa4cf092ce06 (diff) | |
| download | Qt-0c5f0baa59ae56749707c9f73754132cd9b4a44d.zip Qt-0c5f0baa59ae56749707c9f73754132cd9b4a44d.tar.gz Qt-0c5f0baa59ae56749707c9f73754132cd9b4a44d.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
demos/declarative/webbrowser/WebBrowser.qml
demos/declarative/webbrowser/content/pics/addressbar-filled.png
demos/declarative/webbrowser/content/pics/addressbar.png
demos/declarative/webbrowser/content/pics/back-disabled.png
demos/declarative/webbrowser/content/pics/back.png
demos/declarative/webbrowser/content/pics/footer.png
demos/declarative/webbrowser/content/pics/forward-disabled.png
demos/declarative/webbrowser/content/pics/forward.png
demos/declarative/webbrowser/content/pics/header.png
demos/declarative/webbrowser/content/pics/reload.png
Diffstat (limited to 'src/declarative/fx/qfxcontentwrapper.cpp')
| -rw-r--r-- | src/declarative/fx/qfxcontentwrapper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/fx/qfxcontentwrapper.cpp b/src/declarative/fx/qfxcontentwrapper.cpp index 80710ca..5ce5430 100644 --- a/src/declarative/fx/qfxcontentwrapper.cpp +++ b/src/declarative/fx/qfxcontentwrapper.cpp @@ -95,7 +95,7 @@ QML_DEFINE_TYPE(QFxContent,Content); /*! \qmlclass Content QFxContent - \ingroup utility + \ingroup group_utility \brief Content is used as a placeholder for the content of a component. \inherits Item |