Merge branch '2.3'

[qt-creator-jp/qt-creator-jp.git] / src / plugins / qt4projectmanager / qt4project.cpp

diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index dbba9d5..6907853 100644 (file)
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -122,8 +122,8 @@ QDebug operator<<(QDebug d, const  Qt4ProjectFiles &f)
 // A visitor to collect all files of a project in a Qt4ProjectFiles struct
 class ProjectFilesVisitor : public ProjectExplorer::NodesVisitor
 {
-    Q_DISABLE_COPY(ProjectFilesVisitor)
     ProjectFilesVisitor(Qt4ProjectFiles *files);
+
 public:
 
     static void findProjectFiles(Qt4ProFileNode *rootNode, Qt4ProjectFiles *files);
@@ -558,9 +558,10 @@ void Qt4Project::updateQmlJSCodeModel()
         preferDebugDump = activeTarget()->activeBuildConfiguration()->qmakeBuildConfiguration() & QtSupport::BaseQtVersion::DebugBuild;
         QtSupport::BaseQtVersion *qtVersion = activeTarget()->activeBuildConfiguration()->qtVersion();
         if (qtVersion && qtVersion->isValid()) {
-            const QString qtVersionImportPath = qtVersion->versionInfo().value("QT_INSTALL_IMPORTS");
-            if (!qtVersionImportPath.isEmpty())
-                projectInfo.importPaths += qtVersionImportPath;
+            projectInfo.qtImportsPath = qtVersion->versionInfo().value("QT_INSTALL_IMPORTS");
+            if (!projectInfo.qtImportsPath.isEmpty())
+                projectInfo.importPaths += projectInfo.qtImportsPath;
+            projectInfo.qtVersionString = qtVersion->qtVersionString();
         }
     }
     QtSupport::QmlDumpTool::pathAndEnvironment(this, activeTarget()->activeBuildConfiguration()->qtVersion(),