633de66316
- bz#627553, #define in included file in different directory not handled properly - Inherited documentation doesn't work in case of multiple inheritance
15 lines
719 B
Diff
15 lines
719 B
Diff
--- doxygen-1.7.1/src/pre.l 2010-06-18 12:04:30.000000000 +0200
|
|
+++ doxygen-1.7.1/src/pre.l.include 2010-08-26 12:36:27.000000000 +0200
|
|
@@ -128,6 +128,11 @@ static void setFileName(const char *name
|
|
QFileInfo fi(name);
|
|
g_yyFileName=convertToQCString(fi.absFilePath());
|
|
g_yyFileDef=findFileDef(Doxygen::inputNameDict,g_yyFileName,ambig);
|
|
+ if (g_yyFileDef==0) // if this is not an input file check if it is an
|
|
+ // include file
|
|
+ {
|
|
+ g_yyFileDef=findFileDef(Doxygen::includeNameDict,g_yyFileName,ambig);
|
|
+ }
|
|
//printf("setFileName(%s) g_yyFileName=%s g_yyFileDef=%p\n",
|
|
// name,g_yyFileName.data(),g_yyFileDef);
|
|
if (g_yyFileDef && g_yyFileDef->isReference()) g_yyFileDef=0;
|