aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2010-08-23 15:55:50 +0200
committerhjk <qtc-committer@nokia.com>2010-08-23 16:12:23 +0200
commitda2bc39edd3d1bd7931ae32cf8cfcf41b7d67f30 (patch)
tree6cb1803fbe27fa6a035a68c0d2d3862704bed681
parent55c074e89c8d818b04621da4a82ccd77fe942c6e (diff)
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)
-rw-r--r--src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
index b8588c3495..f6aef6c78c 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,