Merge branch 'debugintegration'

Conflicts: src/plugins/qmlprojectmanager/qmlproject.cpp src/plugins/qmlprojectmanager/qmlproject.h
2010-02-16 16:30:41 +01:00
parent 5262ca2061 580280af26
commit 4e5089d90d
28 changed files with 1275 additions and 567 deletions
--- a/src/plugins/qmlprojectmanager/qmlproject.h
+++ b/src/plugins/qmlprojectmanager/qmlproject.h
@@ -127,6 +127,7 @@ private:

    Internal::QmlProjectNode *m_rootNode;
    Internal::QmlProjectTargetFactory *m_targetFactory;
+
 };

 } // namespace QmlProjectManager