summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormae <qt-info@nokia.com>2010-06-29 14:28:31 (GMT)
committermae <qt-info@nokia.com>2010-06-29 14:29:37 (GMT)
commitf75d82c7c3364c5f4e5b3799cbeb9daae4cf6e61 (patch)
treeae28eebef4edcaabc3227800d1a00bdc4d904a90
parent66db2c2b9e4395dffbb073942c23bd737567cc28 (diff)
downloadQt-f75d82c7c3364c5f4e5b3799cbeb9daae4cf6e61.zip
Qt-f75d82c7c3364c5f4e5b3799cbeb9daae4cf6e61.tar.gz
Qt-f75d82c7c3364c5f4e5b3799cbeb9daae4cf6e61.tar.bz2
update qml.qch to version 4.7
This fixes a version clash when both qt.qch and qml.qch are loaded into Qt Creator Done-with: Daniel Molkentin
-rw-r--r--tools/qdoc3/test/qdeclarative.qdocconf4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qdoc3/test/qdeclarative.qdocconf b/tools/qdoc3/test/qdeclarative.qdocconf
index 74fd802..0433c9f 100644
--- a/tools/qdoc3/test/qdeclarative.qdocconf
+++ b/tools/qdoc3/test/qdeclarative.qdocconf
@@ -6,7 +6,7 @@ include(qt-defines.qdocconf)
project = Qml
description = Qml Reference Documentation
-url = http://qt.nokia.com/doc/4.6/
+url = http://qt.nokia.com/doc/4.7/
qmlonly = true
edition.Console.modules = QtCore QtDBus QtNetwork QtScript QtSql QtXml \
@@ -21,7 +21,7 @@ edition.DesktopLight.groups = -graphicsview-api
qhp.projects = Qml
qhp.Qml.file = qml.qhp
-qhp.Qml.namespace = com.trolltech.qml.460
+qhp.Qml.namespace = com.trolltech.qml.470
qhp.Qml.virtualFolder = qdoc
qhp.Qml.indexTitle = Qml Reference