From 1341161998d3ed9fe005fc94eda1723b8da02079 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Fri, 20 Mar 2015 13:52:20 +0100 Subject: qdoc: Duplicate QML types in the "All QML Types" list are distinguished MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We have two State types in the All QML Types list. One is in QtQuick and the other is in QtQml, but they are both just listed as "State" with no way to tell which is which. Now they look like this: State: QtQml State: QtQuick Change-Id: I48bb3deda10a61f565d1aed1910360fea4fb7891 Task-number: QTBUG-45141 Reviewed-by: Topi Reiniö --- src/tools/qdoc/main.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/tools/qdoc/main.cpp') diff --git a/src/tools/qdoc/main.cpp b/src/tools/qdoc/main.cpp index 74d706efe1..825358c354 100644 --- a/src/tools/qdoc/main.cpp +++ b/src/tools/qdoc/main.cpp @@ -341,17 +341,16 @@ static void processQdocconfFile(const QString &fileName) Location outputFormatsLocation = config.lastLocation(); qdb->clearSearchOrder(); - QString p = config.getString(CONFIG_PROJECT).toLower(); if (!Generator::singleExec()) { Generator::debug(" loading index files"); loadIndexFiles(config); Generator::debug(" done loading index files"); - qdb->newPrimaryTree(p); + qdb->newPrimaryTree(project); } else if (Generator::preparing()) - qdb->newPrimaryTree(p); + qdb->newPrimaryTree(project); else - qdb->setPrimaryTree(p); + qdb->setPrimaryTree(project); dependModules = config.getStringList(CONFIG_DEPENDS); dependModules.removeDuplicates(); -- cgit v1.2.3