diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-06-07 16:18:03 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-06-07 16:18:08 +0300 |
| commit | dee9f0867ad66cb3a9848f2391ba450aa6f65f25 (patch) | |
| tree | dced1c5dbcb7b9886c7bcdcb1ba03f63569da913 /src/doc/src/qtee-static-linking.qdoc | |
| parent | d911547fa765cfccbdc2e5389e795681ee7c9c3a (diff) | |
| parent | 62095d715fb2149b73264b66660f9b7451721549 (diff) | |
Merge remote-tracking branch 'origin/dev' into 5.7
* origin/dev:
Add support for Raspberry Pi 3
doc: Add emulator build instructions
Change-Id: I4d294cb1246700ef9948032734770ced5a805389
Diffstat (limited to 'src/doc/src/qtee-static-linking.qdoc')
| -rw-r--r-- | src/doc/src/qtee-static-linking.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doc/src/qtee-static-linking.qdoc b/src/doc/src/qtee-static-linking.qdoc index 4014dbc..4357784 100644 --- a/src/doc/src/qtee-static-linking.qdoc +++ b/src/doc/src/qtee-static-linking.qdoc @@ -20,7 +20,7 @@ \page qtee-static-linking.html \title Linking to Static Builds of Qt \previouspage qtee-custom-embedded-linux-image.html - \nextpage qtee-changelog.html + \nextpage qtee-build-emulator.html The device-specific sysroots in \B2Q come with a dynamically linked version of Qt libraries (\c *.so files). In some cases, using static linking may be |