diff options
author | aksalova <akseli.salovaara@digia.com> | 2012-04-17 13:42:49 (GMT) |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-18 11:43:07 (GMT) |
commit | 36820a366bf678cfcf184cb6a30f3e81c9aa0576 (patch) | |
tree | 922179ac7d1302ab996681d0fdfade8ea6fed6d9 /tools | |
parent | ced72d66afd8796887e69db05187a46a2cd08e97 (diff) | |
download | Qt-36820a366bf678cfcf184cb6a30f3e81c9aa0576.zip Qt-36820a366bf678cfcf184cb6a30f3e81c9aa0576.tar.gz Qt-36820a366bf678cfcf184cb6a30f3e81c9aa0576.tar.bz2 |
Bump Qt version to 4.8.2
Change-Id: Iecae324b1ae00c0d6fb6ed36a8f4a27f51a31d07
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Simo Fält <simo.falt@nokia.com>
Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/assistant/tools/assistant/doc/assistant.qdocconf | 2 | ||||
-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 | 12 |
10 files changed, 31 insertions, 31 deletions
diff --git a/tools/assistant/tools/assistant/doc/assistant.qdocconf b/tools/assistant/tools/assistant/doc/assistant.qdocconf index 7d46819..3562be3 100644 --- a/tools/assistant/tools/assistant/doc/assistant.qdocconf +++ b/tools/assistant/tools/assistant/doc/assistant.qdocconf @@ -12,5 +12,5 @@ HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \ "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \ "<td width=\"30%\" align=\"left\">Copyright © 2012 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \ "<td width=\"40%\" align=\"center\">Trademarks</td>\n" \ - "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.8.1</div></td>\n" \ + "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.8.2</div></td>\n" \ "</tr></table></div></address>" diff --git a/tools/qdoc3/doc/files/qt.qdocconf b/tools/qdoc3/doc/files/qt.qdocconf index 192cffa..68ae0b6 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.481 +qhp.Qt.namespace = com.trolltech.qt.482 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.1 qtrefdoc -qhp.Qt.customFilters.Qt.name = Qt 4.8.1 -qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.1 +qhp.Qt.filterAttributes = qt 4.8.2 qtrefdoc +qhp.Qt.customFilters.Qt.name = Qt 4.8.2 +qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.2 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 94ac7da..13d72de 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.481 +qhp.Assistant.namespace = com.trolltech.assistant.482 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.1 tools assistant +qhp.Assistant.filterAttributes = qt 4.8.2 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 89b78fe..90841f4 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.481 +qhp.Designer.namespace = com.trolltech.designer.482 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.1 tools designer +qhp.Designer.filterAttributes = qt 4.8.2 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 8b14d8c..8ba7946 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.481 +qhp.Linguist.namespace = com.trolltech.linguist.482 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.1 tools linguist +qhp.Linguist.filterAttributes = qt 4.8.2 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 5f307de..2b84d8d 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.481 +qhp.Qml.namespace = com.trolltech.qml.482 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.1 qtrefdoc -qhp.Qml.customFilters.Qt.name = Qt 4.8.1 -qhp.Qml.customFilters.Qt.filterAttributes = qt 4.8.1 +qhp.Qml.filterAttributes = qt 4.8.2 qtrefdoc +qhp.Qml.customFilters.Qt.name = Qt 4.8.2 +qhp.Qml.customFilters.Qt.filterAttributes = qt 4.8.2 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 d3bbc66..db7d0fd 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.481 +qhp.qmake.namespace = com.trolltech.qmake.482 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.1 tools qmake +qhp.qmake.filterAttributes = qt 4.8.2 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 6dfe344..1f14a8d 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.481 +qhp.Qt.namespace = com.trolltech.qt.482 qhp.Qt.virtualFolder = qdoc qhp.Qt.title = Qt qhp.Qt.indexTitle = Qt qhp.Qt.selectors = fake:example -qhp.Qt.filterAttributes = qt 4.8.1 qtrefdoc ja_JP -qhp.Qt.customFilters.Qt.name = Qt 4.8.1 -qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.1 +qhp.Qt.filterAttributes = qt 4.8.2 qtrefdoc ja_JP +qhp.Qt.customFilters.Qt.name = Qt 4.8.2 +qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.2 # 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 356560e..17bafc3 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.481 +qhp.Qt.namespace = com.trolltech.qt.482 qhp.Qt.virtualFolder = qdoc qhp.Qt.title = 教程 qhp.Qt.indexTitle = 教程 qhp.Qt.selectors = fake:example -qhp.Qt.filterAttributes = qt 4.8.1 qtrefdoc zh_CN -qhp.Qt.customFilters.Qt.name = Qt 4.8.1 -qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.1 +qhp.Qt.filterAttributes = qt 4.8.2 qtrefdoc zh_CN +qhp.Qt.customFilters.Qt.name = Qt 4.8.2 +qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.2 # 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 e31c2ef..0b83856 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.1 +version = 4.8.2 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.481 +qhp.Qt.namespace = com.trolltech.qt.482 qhp.Qt.virtualFolder = qdoc qhp.Qt.indexTitle = Qt Reference Documentation qhp.Qt.indexRoot = -qhp.Qt.filterAttributes = qt 4.8.1 qtrefdoc -qhp.Qt.customFilters.Qt.name = Qt 4.8.1 -qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.1 +qhp.Qt.filterAttributes = qt 4.8.2 qtrefdoc +qhp.Qt.customFilters.Qt.name = Qt 4.8.2 +qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.2 qhp.Qt.subprojects = classes overviews examples qhp.Qt.subprojects.classes.title = Classes qhp.Qt.subprojects.classes.indexTitle = Qt's Classes @@ -38,7 +38,7 @@ qhp.Qt.subprojects.examples.selectors = fake:example dita.metadata.default.author = Qt Development Frameworks dita.metadata.default.permissions = all dita.metadata.default.publisher = Nokia -dita.metadata.default.copyryear = 2011 +dita.metadata.default.copyryear = 2012 dita.metadata.default.copyrholder = Nokia dita.metadata.default.audience = programmer |