diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-18 14:45:04 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-18 14:45:13 +0200 |
commit | 66f69a2052573af086fc5e0286e6af5ccaa80d97 (patch) | |
tree | 25056d484013efbbbb3eb1a78ad6a6449b671578 /src/webengine/api/qquickwebengineaction.cpp | |
parent | b74e93a9b07243da4f3d2784cde49916de455364 (diff) | |
parent | d74fd9b0d9bf5ab80e6c104fec5a92a9b3b9372d (diff) | |
download | qtwebengine-66f69a2052573af086fc5e0286e6af5ccaa80d97.tar.gz |
Merge branch '5.12' into dev
Change-Id: Icf2b740cb1eb2810beab98ff705e0bb59625f55e
Diffstat (limited to 'src/webengine/api/qquickwebengineaction.cpp')
-rw-r--r-- | src/webengine/api/qquickwebengineaction.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webengine/api/qquickwebengineaction.cpp b/src/webengine/api/qquickwebengineaction.cpp index ce2fe6357..a0be20b54 100644 --- a/src/webengine/api/qquickwebengineaction.cpp +++ b/src/webengine/api/qquickwebengineaction.cpp @@ -134,7 +134,7 @@ QString QQuickWebEngineAction::text() const /*! \qmlproperty string WebEngineAction::iconText - This property holds the action's descriptive icon text + This property holds the action's descriptive icon text. */ QString QQuickWebEngineAction::iconText() const { |