[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kapidox] src/kapidox: Fix installing multiple .qch
From:       Aurélien Gâteau <agateau () kde ! org>
Date:       2014-05-27 11:49:53
Message-ID: E1WpFtB-00060Z-93 () scm ! kde ! org
[Download RAW message or body]

Git commit f4c831873ab5188ffff3e74d603932af818a5603 by Aurélien Gâteau.
Committed on 27/05/2014 at 11:48.
Pushed by gateau into branch 'master'.

Fix installing multiple .qch

The QHP_NAMESPACE must be unique among frameworks: use org.kde.$modulename
instead of "org.kde.www"

M  +0    -1    src/kapidox/data/Doxyfile.global
M  +1    -0    src/kapidox/generator.py

http://commits.kde.org/kapidox/f4c831873ab5188ffff3e74d603932af818a5603

diff --git a/src/kapidox/data/Doxyfile.global b/src/kapidox/data/Doxyfile.global
index 6c780e3..0d2c667 100644
--- a/src/kapidox/data/Doxyfile.global
+++ b/src/kapidox/data/Doxyfile.global
@@ -149,7 +149,6 @@ IGNORE_PREFIX          = K
 GENERATE_LATEX         = NO
 
 GENERATE_QHP           = NO
-QHP_NAMESPACE          = org.kde.www
 
 GENERATE_MAN           = NO
 # Generate dummy files for combined pages
diff --git a/src/kapidox/generator.py b/src/kapidox/generator.py
index b8be6e2..203586e 100644
--- a/src/kapidox/generator.py
+++ b/src/kapidox/generator.py
@@ -511,6 +511,7 @@ def generate_apidocs(ctx, tmp_dir, doxyfile_entries=None, keep_temp_dirs=False):
         # overrides it
         writer.write_entries(
                 QHP_VIRTUAL_FOLDER=ctx.modulename,
+                QHP_NAMESPACE="org.kde." + ctx.modulename,
                 QHG_LOCATION=ctx.qhelpgenerator)
 
         writer.write_entries(
[prev in list] [next in list] [prev in thread] [next in thread]