1 files changed, 16 insertions, 1 deletions
diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
index a44cbb90d0..7aa32cae75 100644
--- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
+++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
@@ -157,8 +157,14 @@ 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/") +
-                                   dirName.replace(slash, QLatin1Char('-')) +
+                                   dirName1 +
                                    QLatin1Char('-') + fn + QLatin1String(".html");
 
                 QAction *exampleAction = subMenu->addAction(name);
@@ -176,6 +182,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,