Don't add $QT_INSTALL_HEADERS/Qt to the include paths.

Indexing both /include/Qt and /include/{QtCore,QtGui,...} makes the code completion with fedora.

1 files changed, 6 insertions, 3 deletions

diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 9f58d47705..9ca8ca8521 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -452,9 +452,12 @@ void Qt4Project::updateCodeModel()
     predefinedIncludePaths.append(newQtIncludePath);
     QDir dir(newQtIncludePath);
     foreach (QFileInfo info, dir.entryInfoList(QDir::Dirs)) {
-        if (! info.fileName().startsWith(QLatin1String("Qt")))
-            continue;
-        predefinedIncludePaths.append(info.absoluteFilePath());
+        const QString path = info.fileName();
+
+        if (path == QLatin1String("Qt"))
+            continue; // skip $QT_INSTALL_HEADERS/Qt. There's no need to include it.
+        else if (path.startsWith(QLatin1String("Qt")) || path == QLatin1String("phonon"))
+            predefinedIncludePaths.append(info.absoluteFilePath());
     }
 
     FindQt4ProFiles findQt4ProFiles;