diff options
author | Pierre Rossi <pierre.rossi@nokia.com> | 2012-08-01 14:20:32 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-02 17:37:56 +0200 |
commit | 227a60a427f83931ca8bdaec7509a673738f053b (patch) | |
tree | 361a34049f4b15efc8782966e6bb80a7382308cd /src/assistant/help/qhelpengine.h | |
parent | 677acf607409b4fe99a99516ddd6fc81e63cd82c (diff) | |
download | qttools-227a60a427f83931ca8bdaec7509a673738f053b.tar.gz |
Prepare QtHelp library for modularized documentation.
- Support ".." in QCH documentation file paths.
This essentially means that we stop using cleanPath, and where needed,
prepend the virtual folder name, followed by "/..", in front of the
original path.
- Remove com.trolltech default DocPath since this was not used anymore.
Done-with: Casper van Donderen <casper.vandonderen@nokia.com>
Change-Id: I7309805000f343e2f58c74cd0655a936399fd939
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/assistant/help/qhelpengine.h')
-rw-r--r-- | src/assistant/help/qhelpengine.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/assistant/help/qhelpengine.h b/src/assistant/help/qhelpengine.h index 3bff849d1..72a8d3938 100644 --- a/src/assistant/help/qhelpengine.h +++ b/src/assistant/help/qhelpengine.h @@ -74,6 +74,8 @@ public: private: QHelpEnginePrivate *d; + + friend class HelpEngineWrapper; }; QT_END_NAMESPACE |