diff options
author | aavit <eirik.aavitsland@digia.com> | 2014-11-14 15:01:55 +0100 |
---|---|---|
committer | aavit <eirik.aavitsland@digia.com> | 2014-11-14 15:25:43 +0100 |
commit | 7c5126a80c95f262ff3c480604b57532d9ed9079 (patch) | |
tree | 053fba4f2f3ccd2b231b310ab49b9db39491d095 /src/doc/config | |
parent | 1f0de42b9d5a8ef665e6799019eed898b0396586 (diff) | |
parent | 9b2dd9f64bdd5c2349407ae8517ae974eda97885 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ib0a08de8aaf17f2803d51bded8d0dcfb14e9c206
Diffstat (limited to 'src/doc/config')
-rw-r--r-- | src/doc/config/b2qt.qdocconf | 4 | ||||
-rw-r--r-- | src/doc/config/html-offline.qdocconf | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/doc/config/b2qt.qdocconf b/src/doc/config/b2qt.qdocconf index 1e4b5ff..1e499dc 100644 --- a/src/doc/config/b2qt.qdocconf +++ b/src/doc/config/b2qt.qdocconf @@ -6,7 +6,7 @@ sourceencoding = UTF-8 project = QtEnterpriseEmbedded description = Qt Enterprise Embedded Documentation -version = 3.1.1 +version = 3.2.0 sourcedirs = ../src \ ../../imports/wifi \ @@ -24,7 +24,7 @@ indexes = $QT_INSTALL_DOCS/qtquick/qtquick.index \ qhp.projects = B2Qt qhp.B2Qt.file = b2qt.qhp -qhp.B2Qt.namespace = com.digia.b2qt.311 +qhp.B2Qt.namespace = com.digia.b2qt.320 qhp.B2Qt.virtualFolder = b2qt qhp.B2Qt.indexTitle = Qt Enterprise Embedded Documentation qhp.B2Qt.indexRoot = diff --git a/src/doc/config/html-offline.qdocconf b/src/doc/config/html-offline.qdocconf index 0e01c05..997bf42 100644 --- a/src/doc/config/html-offline.qdocconf +++ b/src/doc/config/html-offline.qdocconf @@ -23,5 +23,5 @@ HTML.footer = \ " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \ " of their respective owners. <a title=\"Privacy Policy\"\n" \ - " href=\"http://qt.digia.com/Digia-Legal-Notice--Privacy-Policy/\">Privacy Policy</a></p>\n" \ + " href=\"http://www.qt.io/privacy-policy\">Privacy Policy</a></p>\n" \ "</div>\n" |