diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:56:18 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-26 19:55:26 +0100 |
| commit | 573fb399f9917713621d25e0c0aeb48fbc085af5 (patch) | |
| tree | edb575544ccc2e48a410f41472a3827ea1f00477 /src/virtualkeyboard/styles/styles_plugin.cpp | |
| parent | 947a55149aec2724158934efde1be496b3c5e04e (diff) | |
| parent | e67e97e9543eae2de42666eec3ff4d3cdca81db3 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf
Change-Id: I2aac70f4bf65794c73096ec575c9f72bc63ec61c
Diffstat (limited to 'src/virtualkeyboard/styles/styles_plugin.cpp')
| -rw-r--r-- | src/virtualkeyboard/styles/styles_plugin.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/virtualkeyboard/styles/styles_plugin.cpp b/src/virtualkeyboard/styles/styles_plugin.cpp index e5915b87..975ab401 100644 --- a/src/virtualkeyboard/styles/styles_plugin.cpp +++ b/src/virtualkeyboard/styles/styles_plugin.cpp @@ -35,8 +35,17 @@ /*! \qmlmodule QtQuick.VirtualKeyboard.Styles 2.0 + \title Qt Quick Virtual Keyboard Styles QML Types + \ingroup qmlmodules - This module provides styling components for the Qt Virtual Keyboard. + \brief Provides styling for Qt Virtual Keyboard. + + The QML types can be imported into your application using the following + import statements in your .qml file: + + \badcode + import QtQuick.VirtualKeyboard.Styles 2.0 + \endcode */ void QtVirtualKeyboardStylesPlugin::registerTypes(const char *uri) |