summaryrefslogtreecommitdiffstats
path: root/src/declarative/fx/qfxfocuspanel.cpp
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-05-01 05:50:35 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-05-01 05:50:35 (GMT)
commit59be06a01a3c26be4de57ce9f8b229cce7e26520 (patch)
treeb9bb17a1d2fc6c465807e938f27d9871e4f91fff /src/declarative/fx/qfxfocuspanel.cpp
parent170f2857803344a198eaf71d8f15b07e3ff0e2ad (diff)
parentea0284d0f4a3408d7c1219702214c263118ef52f (diff)
downloadQt-59be06a01a3c26be4de57ce9f8b229cce7e26520.zip
Qt-59be06a01a3c26be4de57ce9f8b229cce7e26520.tar.gz
Qt-59be06a01a3c26be4de57ce9f8b229cce7e26520.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfxfocuspanel.cpp')
-rw-r--r--src/declarative/fx/qfxfocuspanel.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/fx/qfxfocuspanel.cpp b/src/declarative/fx/qfxfocuspanel.cpp
index 67c456e..5d62e66 100644
--- a/src/declarative/fx/qfxfocuspanel.cpp
+++ b/src/declarative/fx/qfxfocuspanel.cpp
@@ -47,7 +47,7 @@ QML_DEFINE_TYPE(QFxFocusPanel,FocusPanel);
/*!
\qmlclass FocusPanel
- \brief The FocusPanel element explicitly creates a focus panel.
+ \brief The FocusPanel object explicitly creates a focus panel.
\inherits Item
Focus panels assist in keyboard focus handling when building QML
@@ -73,7 +73,7 @@ QFxFocusPanel::~QFxFocusPanel()
/*!
\qmlproperty bool FocusPanel::active
- Sets whether the element is the active focus panel.
+ Sets whether the object is the active focus panel.
*/
bool QFxFocusPanel::isActive() const