summaryrefslogtreecommitdiffstats
path: root/src/config.l
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2009-12-30 13:28:15 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2009-12-30 13:28:15 (GMT)
commitdf4e1edf1f6abb55a811e7c4a34764f27b50e502 (patch)
treee73e0b41d708a8ea6260e541347b464cb2e5aeaa /src/config.l
parentf4fab829c8e9b4bf54c60fd85805eb008c3838ab (diff)
downloadDoxygen-df4e1edf1f6abb55a811e7c4a34764f27b50e502.zip
Doxygen-df4e1edf1f6abb55a811e7c4a34764f27b50e502.tar.gz
Doxygen-df4e1edf1f6abb55a811e7c4a34764f27b50e502.tar.bz2
Release-1.6.2
Diffstat (limited to 'src/config.l')
-rw-r--r--src/config.l17
1 files changed, 4 insertions, 13 deletions
diff --git a/src/config.l b/src/config.l
index 62e3d7c..c1a4726 100644
--- a/src/config.l
+++ b/src/config.l
@@ -1361,26 +1361,17 @@ void Config::check()
// check QHP creation requirements
if (Config_getBool("GENERATE_QHP"))
{
- bool qhp=TRUE;
- if (!Config_getBool("GENERATE_HTML"))
- {
- config_err("Error: GENERATE_QHP=YES requires GENERATE_HTML=YES. Disabling QHP output.\n");
- qhp=FALSE;
- }
-
if (Config_getString("QHP_NAMESPACE").isEmpty())
{
- config_err("Error: GENERATE_QHP=YES requires QHP_NAMESPACE to be set. Disabling QHP output.\n");
- qhp=FALSE;
+ config_err("Error: GENERATE_QHP=YES requires QHP_NAMESPACE to be set. Using 'org.doxygen.doc' as default!.\n");
+ Config_getString("QHP_NAMESPACE")="org.doxygen.doc";
}
if (Config_getString("QHP_VIRTUAL_FOLDER").isEmpty())
{
- config_err("Error: GENERATE_QHP=YES requires QHP_VIRTUAL_FOLDER to be set. Disabling QHP output.\n");
- qhp=FALSE;
+ config_err("Error: GENERATE_QHP=YES requires QHP_VIRTUAL_FOLDER to be set. Using 'doc' as default!\n");
+ Config_getString("QHP_VIRTUAL_FOLDER")="doc";
}
-
- Config_getBool("GENERATE_QHP")=qhp;
}
if (Config_getBool("OPTIMIZE_OUTPUT_JAVA") && Config_getBool("INLINE_INFO"))