diff options
author | Liang Qi <liang.qi@qt.io> | 2017-08-15 12:24:35 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 13:50:35 +0200 |
commit | c7af140c1e59cd1e5f8a7361b9be593548e105a0 (patch) | |
tree | ea0033688ff25d1ea0ac48103aad54370f4e070a /src/virtualkeyboard/doc/src | |
parent | 4437f07e2c15391144f56140a8f0cbc7a14517c1 (diff) | |
parent | dd8c39ea9312ec1441b3fdd830f9d42fe3258b58 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/virtualkeyboard/t9writeworker.cpp
src/virtualkeyboard/t9writeworker.h
Change-Id: I1fa1567e2739766c55c0e94b10706eecb8ba2ae1
Diffstat (limited to 'src/virtualkeyboard/doc/src')
-rw-r--r-- | src/virtualkeyboard/doc/src/deployment-guide.qdoc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/virtualkeyboard/doc/src/deployment-guide.qdoc b/src/virtualkeyboard/doc/src/deployment-guide.qdoc index c3729d84..431dcf10 100644 --- a/src/virtualkeyboard/doc/src/deployment-guide.qdoc +++ b/src/virtualkeyboard/doc/src/deployment-guide.qdoc @@ -41,11 +41,8 @@ with Qt 5 applications. \section1 Deployment -The Qt Virtual Keyboard plugin must be properly deployed before it can be used. -The easiest approach to deployment is to add a deployment step -in Qt Creator that executes the \c {make install} command. - -\c {make install} deploys the files in the following locations: +The various Qt Virtual Keyboard plugins and files are deployed in the following +locations: \table \header |