diff options
author | Akseli Salovaara <akseli.salovaara@digia.com> | 2014-12-01 13:27:34 (GMT) |
---|---|---|
committer | Simo Fält <simo.falt@theqtcompany.com> | 2014-12-03 09:16:51 (GMT) |
commit | 9997a687f835926af0d96243caeba32e38761c28 (patch) | |
tree | c533034578bdb3c55dc737773af35faa577ea48a /tools/qdoc3 | |
parent | 020664da2db7086b81864a7f9658cf783b2ec83b (diff) | |
download | Qt-9997a687f835926af0d96243caeba32e38761c28.zip Qt-9997a687f835926af0d96243caeba32e38761c28.tar.gz Qt-9997a687f835926af0d96243caeba32e38761c28.tar.bz2 |
Bump Qt version to 4.8.7
Change-Id: Icd6fcdb59eb1b9fd8de555ef1c1c87a379f06a27
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tools/qdoc3')
-rw-r--r-- | tools/qdoc3/doc/files/qt.qdocconf | 8 | ||||
-rw-r--r-- | tools/qdoc3/test/assistant.qdocconf | 4 | ||||
-rw-r--r-- | tools/qdoc3/test/designer.qdocconf | 4 | ||||
-rw-r--r-- | tools/qdoc3/test/linguist.qdocconf | 4 | ||||
-rw-r--r-- | tools/qdoc3/test/qdeclarative.qdocconf | 8 | ||||
-rw-r--r-- | tools/qdoc3/test/qmake.qdocconf | 4 | ||||
-rw-r--r-- | tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf | 8 | ||||
-rw-r--r-- | tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf | 8 | ||||
-rw-r--r-- | tools/qdoc3/test/qt-project.qdocconf | 10 |
9 files changed, 29 insertions, 29 deletions
diff --git a/tools/qdoc3/doc/files/qt.qdocconf b/tools/qdoc3/doc/files/qt.qdocconf index 2a0bb7e..1402040 100644 --- a/tools/qdoc3/doc/files/qt.qdocconf +++ b/tools/qdoc3/doc/files/qt.qdocconf @@ -22,7 +22,7 @@ edition.DesktopLight.groups = -graphicsview-api qhp.projects = Qt qhp.Qt.file = qt.qhp -qhp.Qt.namespace = com.trolltech.qt.486 +qhp.Qt.namespace = com.trolltech.qt.487 qhp.Qt.virtualFolder = qdoc qhp.Qt.indexTitle = Qt Reference Documentation qhp.Qt.indexRoot = @@ -36,9 +36,9 @@ qhp.Qt.extraFiles = classic.css \ images/dynamiclayouts-example.png \ images/stylesheet-coffee-plastique.png -qhp.Qt.filterAttributes = qt 4.8.6 qtrefdoc -qhp.Qt.customFilters.Qt.name = Qt 4.8.6 -qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.6 +qhp.Qt.filterAttributes = qt 4.8.7 qtrefdoc +qhp.Qt.customFilters.Qt.name = Qt 4.8.7 +qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.7 qhp.Qt.subprojects = classes overviews examples qhp.Qt.subprojects.classes.title = Classes qhp.Qt.subprojects.classes.indexTitle = Qt's Classes diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf index 681d236..1abbc23 100644 --- a/tools/qdoc3/test/assistant.qdocconf +++ b/tools/qdoc3/test/assistant.qdocconf @@ -13,7 +13,7 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = Assistant qhp.Assistant.file = assistant.qhp -qhp.Assistant.namespace = com.trolltech.assistant.486 +qhp.Assistant.namespace = com.trolltech.assistant.487 qhp.Assistant.virtualFolder = qdoc qhp.Assistant.indexTitle = Qt Assistant Manual qhp.Assistant.extraFiles = images/bg_l.png \ @@ -50,7 +50,7 @@ qhp.Assistant.extraFiles = images/bg_l.png \ style/style_ie8.css \ style/style.css -qhp.Assistant.filterAttributes = qt 4.8.6 tools assistant +qhp.Assistant.filterAttributes = qt 4.8.7 tools assistant qhp.Assistant.customFilters.Assistant.name = Qt Assistant Manual qhp.Assistant.customFilters.Assistant.filterAttributes = qt tools assistant qhp.Assistant.subprojects = manual examples diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf index cc4f3a9..77c2c2e 100644 --- a/tools/qdoc3/test/designer.qdocconf +++ b/tools/qdoc3/test/designer.qdocconf @@ -13,7 +13,7 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = Designer qhp.Designer.file = designer.qhp -qhp.Designer.namespace = com.trolltech.designer.486 +qhp.Designer.namespace = com.trolltech.designer.487 qhp.Designer.virtualFolder = qdoc qhp.Designer.indexTitle = Qt Designer Manual qhp.Designer.extraFiles = images/bg_l.png \ @@ -50,7 +50,7 @@ qhp.Designer.extraFiles = images/bg_l.png \ style/style_ie8.css \ style/style.css -qhp.Designer.filterAttributes = qt 4.8.6 tools designer +qhp.Designer.filterAttributes = qt 4.8.7 tools designer qhp.Designer.customFilters.Designer.name = Qt Designer Manual qhp.Designer.customFilters.Designer.filterAttributes = qt tools designer qhp.Designer.subprojects = manual examples diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf index b26f211..46d365b 100644 --- a/tools/qdoc3/test/linguist.qdocconf +++ b/tools/qdoc3/test/linguist.qdocconf @@ -13,7 +13,7 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = Linguist qhp.Linguist.file = linguist.qhp -qhp.Linguist.namespace = com.trolltech.linguist.486 +qhp.Linguist.namespace = com.trolltech.linguist.487 qhp.Linguist.virtualFolder = qdoc qhp.Linguist.indexTitle = Qt Linguist Manual qhp.Linguist.extraFiles = images/bg_l.png \ @@ -50,7 +50,7 @@ qhp.Linguist.extraFiles = images/bg_l.png \ style/style_ie8.css \ style/style.css -qhp.Linguist.filterAttributes = qt 4.8.6 tools linguist +qhp.Linguist.filterAttributes = qt 4.8.7 tools linguist qhp.Linguist.customFilters.Linguist.name = Qt Linguist Manual qhp.Linguist.customFilters.Linguist.filterAttributes = qt tools linguist qhp.Linguist.subprojects = manual examples diff --git a/tools/qdoc3/test/qdeclarative.qdocconf b/tools/qdoc3/test/qdeclarative.qdocconf index 9e8ce7e..3023c18 100644 --- a/tools/qdoc3/test/qdeclarative.qdocconf +++ b/tools/qdoc3/test/qdeclarative.qdocconf @@ -21,7 +21,7 @@ edition.DesktopLight.groups = -graphicsview-api qhp.projects = Qml qhp.Qml.file = qml.qhp -qhp.Qml.namespace = com.trolltech.qml.486 +qhp.Qml.namespace = com.trolltech.qml.487 qhp.Qml.virtualFolder = qdoc qhp.Qml.indexTitle = Qml Reference @@ -61,9 +61,9 @@ qhp.Qml.extraFiles = images/bg_l.png \ style/style_ie8.css \ style/style.css -qhp.Qml.filterAttributes = qt 4.8.6 qtrefdoc -qhp.Qml.customFilters.Qt.name = Qt 4.8.6 -qhp.Qml.customFilters.Qt.filterAttributes = qt 4.8.6 +qhp.Qml.filterAttributes = qt 4.8.7 qtrefdoc +qhp.Qml.customFilters.Qt.name = Qt 4.8.7 +qhp.Qml.customFilters.Qt.filterAttributes = qt 4.8.7 qhp.Qml.subprojects = classes qhp.Qml.subprojects.classes.title = Elements qhp.Qml.subprojects.classes.indexTitle = Qml Elements diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf index 3bc31e6..d7371cf 100644 --- a/tools/qdoc3/test/qmake.qdocconf +++ b/tools/qdoc3/test/qmake.qdocconf @@ -13,7 +13,7 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = qmake qhp.qmake.file = qmake.qhp -qhp.qmake.namespace = com.trolltech.qmake.486 +qhp.qmake.namespace = com.trolltech.qmake.487 qhp.qmake.virtualFolder = qdoc qhp.qmake.indexTitle = QMake Manual qhp.qmake.extraFiles = images/bg_l.png \ @@ -50,7 +50,7 @@ qhp.qmake.extraFiles = images/bg_l.png \ style/style_ie8.css \ style/style.css -qhp.qmake.filterAttributes = qt 4.8.6 tools qmake +qhp.qmake.filterAttributes = qt 4.8.7 tools qmake qhp.qmake.customFilters.qmake.name = qmake Manual qhp.qmake.customFilters.qmake.filterAttributes = qt tools qmake qhp.qmake.subprojects = manual diff --git a/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf b/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf index a29a9fc..6cf5113 100644 --- a/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf +++ b/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf @@ -17,15 +17,15 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = Qt qhp.Qt.file = qt.qhp -qhp.Qt.namespace = com.trolltech.qt.486 +qhp.Qt.namespace = com.trolltech.qt.487 qhp.Qt.virtualFolder = qdoc qhp.Qt.title = Qt qhp.Qt.indexTitle = Qt qhp.Qt.selectors = fake:example -qhp.Qt.filterAttributes = qt 4.8.6 qtrefdoc ja_JP -qhp.Qt.customFilters.Qt.name = Qt 4.8.6 -qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.6 +qhp.Qt.filterAttributes = qt 4.8.7 qtrefdoc ja_JP +qhp.Qt.customFilters.Qt.name = Qt 4.8.7 +qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.7 # Files not referenced in any qdoc file (last four are needed by qtdemo) # See also extraimages.HTML diff --git a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf index 835d8b1..844a06c 100644 --- a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf +++ b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf @@ -17,15 +17,15 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = Qt qhp.Qt.file = qt.qhp -qhp.Qt.namespace = com.trolltech.qt.486 +qhp.Qt.namespace = com.trolltech.qt.487 qhp.Qt.virtualFolder = qdoc qhp.Qt.title = 教程 qhp.Qt.indexTitle = 教程 qhp.Qt.selectors = fake:example -qhp.Qt.filterAttributes = qt 4.8.6 qtrefdoc zh_CN -qhp.Qt.customFilters.Qt.name = Qt 4.8.6 -qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.6 +qhp.Qt.filterAttributes = qt 4.8.7 qtrefdoc zh_CN +qhp.Qt.customFilters.Qt.name = Qt 4.8.7 +qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.7 # Files not referenced in any qdoc file (last four are needed by qtdemo) # See also extraimages.HTML diff --git a/tools/qdoc3/test/qt-project.qdocconf b/tools/qdoc3/test/qt-project.qdocconf index 5f6b62b..1d2390c 100644 --- a/tools/qdoc3/test/qt-project.qdocconf +++ b/tools/qdoc3/test/qt-project.qdocconf @@ -6,7 +6,7 @@ include(qt-defines.qdocconf) project = Qt description = Qt Reference Documentation url = http://qt.nokia.com/doc/4.8 -version = 4.8.6 +version = 4.8.7 sourceencoding = UTF-8 outputencoding = UTF-8 @@ -15,14 +15,14 @@ naturallanguage = en_US qhp.projects = Qt qhp.Qt.file = qt.qhp -qhp.Qt.namespace = com.trolltech.qt.486 +qhp.Qt.namespace = com.trolltech.qt.487 qhp.Qt.virtualFolder = qdoc qhp.Qt.indexTitle = Qt Reference Documentation qhp.Qt.indexRoot = -qhp.Qt.filterAttributes = qt 4.8.6 qtrefdoc -qhp.Qt.customFilters.Qt.name = Qt 4.8.6 -qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.6 +qhp.Qt.filterAttributes = qt 4.8.7 qtrefdoc +qhp.Qt.customFilters.Qt.name = Qt 4.8.7 +qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.7 qhp.Qt.subprojects = classes overviews examples qhp.Qt.subprojects.classes.title = Classes qhp.Qt.subprojects.classes.indexTitle = Qt's Classes |