diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-12 16:40:36 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-12 16:40:36 (GMT) |
commit | c7ad2de8f653c82ed26275d9a1791ebf2bb38644 (patch) | |
tree | 8cb794acff34db69b93baf4963bf66e19eb877f9 /tools/qdoc3/test/designer.qdocconf | |
parent | e61071a2a170eaeb524778e9e903100323b88bbe (diff) | |
parent | ad8e7b27427825bee730c55735cd2554407205e4 (diff) | |
download | Qt-c7ad2de8f653c82ed26275d9a1791ebf2bb38644.zip Qt-c7ad2de8f653c82ed26275d9a1791ebf2bb38644.tar.gz Qt-c7ad2de8f653c82ed26275d9a1791ebf2bb38644.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Add Location as self signable capability in patch_capabilities.pl
Localize .loc and .pkg content based on TRANSLATIONS
Bump Qt version to 4.7.2.
SSL: Fix for systemCaCertificates being called first on symbian
Send WinIdChange event when winId is set to zero
Diffstat (limited to 'tools/qdoc3/test/designer.qdocconf')
-rw-r--r-- | tools/qdoc3/test/designer.qdocconf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf index ab66792..637399b 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.471 +qhp.Designer.namespace = com.trolltech.designer.472 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.7.1 tools designer +qhp.Designer.filterAttributes = qt 4.7.2 tools designer qhp.Designer.customFilters.Designer.name = Qt Designer Manual qhp.Designer.customFilters.Designer.filterAttributes = qt tools designer qhp.Designer.subprojects = manual examples |