Skip to content

Commit f072e63

Browse files
committed
Avoid extra navigation entries when using partial layout file
1 parent 828fd14 commit f072e63

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/layout.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1456,8 +1456,12 @@ void LayoutDocManager::parse(const QCString &fileName, const char *data)
14561456
transcodeCharacterStringToUTF8
14571457
);
14581458
// merge missing parts of the default layout into the user defined layout
1459-
mergeNavEntries(layoutDocManager);
1459+
1460+
// For now merging in defaults has been disabled for navigation entries
1461+
// to avoid "extra entries" for projects that work with partial layout files.
1462+
//mergeNavEntries(layoutDocManager);
14601463
mergeDocEntries(layoutDocManager);
1464+
14611465
// replace default layout with merged layout
14621466
d->docEntries.swap(layoutDocManager.d->docEntries);
14631467
d->rootNav.swap(layoutDocManager.d->rootNav);

0 commit comments

Comments
 (0)