diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 23:11:49 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 23:11:49 +0200 |
| commit | 5b548aa2ffe648810c487ecb895631da2be12a33 (patch) | |
| tree | a7e28e882d7bf2a0148708d845deddbedaf1f1f8 /src/nfc | |
| parent | 0690d4801ca5ee92d5e7511d48d95786212d5fb3 (diff) | |
| parent | 2526f2c4f5a22d0d69bf6c96fedfd709e479b246 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: Ia9bc69bf68eb40ceb9bd5bd63d96ab4dece43c00
Diffstat (limited to 'src/nfc')
| -rw-r--r-- | src/nfc/doc/qtnfc.qdocconf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nfc/doc/qtnfc.qdocconf b/src/nfc/doc/qtnfc.qdocconf index 8b0ba092..61ed15b6 100644 --- a/src/nfc/doc/qtnfc.qdocconf +++ b/src/nfc/doc/qtnfc.qdocconf @@ -4,7 +4,7 @@ project = QtNfc description = Qt NFC Reference Documentation version = $QT_VERSION -examplesinstallpath = qtconnectivity/nfc +examplesinstallpath = nfc qhp.projects = QtNfc |