diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-08-27 13:59:21 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-08-27 13:59:21 +0200 |
commit | bbc9b308db0476d77a67e8c896883410d4660acf (patch) | |
tree | a7b46bcb8e110b506f2bc9272118b564c252903f /src/imports/controls/doc/src | |
parent | 6d2f05a8e283bdc46afac0f3d062bf248559c2b9 (diff) | |
parent | 6b4a6b0deb54f9a65d75d9c9f1e60b32ced1a781 (diff) |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/imports/controls/TabBar.qml
src/imports/controls/material/TabBar.qml
Change-Id: I290091558f7ae94d44be2a117b16867dddb53cb3
Diffstat (limited to 'src/imports/controls/doc/src')
-rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-deployment.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-deployment.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-deployment.qdoc index 51a9b613..fe78ca55 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-deployment.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-deployment.qdoc @@ -30,7 +30,7 @@ \title Deploying Qt Quick Controls 2 Applications Deployment of Qt Quick Controls 2 applications is very similar to - deploment of other types of Qt applications. However, there are a few + deployment of other types of Qt applications. However, there are a few factors to consider. \section1 Deploying an Application with Several Styles |