From da2bc39edd3d1bd7931ae32cf8cfcf41b7d67f30 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 23 Aug 2010 15:55:50 +0200 Subject: [PATCH] Don't show qml only projects under C++ examples Filter out all examples that are missing a .pro file. Afterwards remove empty categories. (cherry picked from commit 56f735425af32e4ffdfc959bc90a2ae85f6b4544) --- .../gettingstartedwelcomepagewidget.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp index b8588c34951..f6aef6c78ca 100644 --- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp +++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp @@ -163,6 +163,10 @@ void GettingStartedWelcomePageWidget::updateCppExamples(const QString &examplePa QString fileName = examplePath + relativeProPath; if (!QFile::exists(fileName)) fileName = sourcePath + QLatin1String("/examples") + relativeProPath; + if (!QFile::exists(fileName)) { + continue; // might be .qmlproject + } + QString dirName1 = dirName; dirName1.replace(slash, QLatin1Char('-')); QString helpPath = QLatin1String("qthelp://com.trolltech.qt/qdoc/") + @@ -184,6 +188,15 @@ void GettingStartedWelcomePageWidget::updateCppExamples(const QString &examplePa break; } } + + // Remove empty categories + foreach (QAction *action, menu->actions()) { + if (QMenu *subMenu = action->menu()) { + if (subMenu->isEmpty()) { + menu->removeAction(action); + } + } + } } void GettingStartedWelcomePageWidget::updateQmlExamples(const QString &examplePath,