diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-18 08:30:34 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-18 08:30:34 (GMT) |
| commit | d8bd04956a01ab3066958dca0618dc47bfeee083 (patch) | |
| tree | bb2b729af7b05dd5f93484a9f40858c7685bf763 /tools/qdoc3/test/assistant.qdocconf | |
| parent | e1d8cf0b1cb07f7c4e70017322f2f548ae216e78 (diff) | |
| parent | 051793b7558ed16dfcb84f62ce3bd4a1545906a7 (diff) | |
| download | Qt-d8bd04956a01ab3066958dca0618dc47bfeee083.zip Qt-d8bd04956a01ab3066958dca0618dc47bfeee083.tar.gz Qt-d8bd04956a01ab3066958dca0618dc47bfeee083.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:
Fix for WServ 64 crash on Symbian.
Use include(original mkspec) instead of copying of mkspec to default
Fixed code style of d92cbfc5, reported by git push.
Switched qdesktopservices to use SchemeHandler for Symbian^3 and later.
Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp.
Documented usage of dialogs on Symbian
Native file dialog on Symbian^3
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/assistant.qdocconf')
| -rw-r--r-- | tools/qdoc3/test/assistant.qdocconf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf index 74b68df..0e9a2a8 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.471 +qhp.Assistant.namespace = com.trolltech.assistant.472 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.7.1 tools assistant +qhp.Assistant.filterAttributes = qt 4.7.2 tools assistant qhp.Assistant.customFilters.Assistant.name = Qt Assistant Manual qhp.Assistant.customFilters.Assistant.filterAttributes = qt tools assistant qhp.Assistant.subprojects = manual examples |