diff options
author | Mitch Curtis <mitch.curtis@digia.com> | 2014-07-10 17:16:09 +0200 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@digia.com> | 2014-07-17 11:24:08 +0200 |
commit | a38f8d96fc5781e6d99eadbd435f408f8729ac1b (patch) | |
tree | 2cc384a71da65359779a4365a9f910c19b6545dc /src/quick/util/qquickutilmodule.cpp | |
parent | 112efda64ba24e7d9255a36065223e9800a50c21 (diff) |
Add QQuickFontMetrics.
This will be a private C++ type that is exposed to QtQuick 2.4 as
FontMetrics.
[ChangeLog][QtQuick] Added QQuickFontMetrics, which provides a subset
of QFontMetricsF's API.
Change-Id: Iac31e5a555bd8f1dc0904b8de0408e5f1a402b25
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/quick/util/qquickutilmodule.cpp')
-rw-r--r-- | src/quick/util/qquickutilmodule.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quick/util/qquickutilmodule.cpp b/src/quick/util/qquickutilmodule.cpp index a6e907713a..1d82cfca43 100644 --- a/src/quick/util/qquickutilmodule.cpp +++ b/src/quick/util/qquickutilmodule.cpp @@ -45,6 +45,7 @@ #include "qquickbehavior_p.h" #include "qquicksmoothedanimation_p.h" #include "qquickfontloader_p.h" +#include "qquickfontmetrics_p.h" #include "qquickpropertychanges_p.h" #include "qquickspringanimation_p.h" #include "qquickstategroup_p.h" @@ -106,4 +107,6 @@ void QQuickUtilModule::defineModule() qRegisterMetaType<QKeySequence::StandardKey>(); qmlRegisterUncreatableType<QKeySequence, 2>("QtQuick", 2, 2, "StandardKey", QStringLiteral("Cannot create an instance of StandardKey.")); + + qmlRegisterType<QQuickFontMetrics>("QtQuick", 2, 4, "FontMetrics"); } |