Merge remote-tracking branch 'origin/2.7'

Conflicts: share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp Change-Id: I7f319154d5865c47ccfd5f525f0fd7983733dd0e
2013-05-03 09:49:28 +02:00
parent 364c95476e 6999e3c339
commit a2171c2d82
37 changed files with 178 additions and 84 deletions
--- a/src/plugins/cmakeprojectmanager/cmakeuicodemodelsupport.h
+++ b/src/plugins/cmakeprojectmanager/cmakeuicodemodelsupport.h
@@ -43,6 +43,7 @@ class CMakeProject;

 class CMakeUiCodeModelSupport : public CppTools::UiCodeModelSupport
 {
+    Q_OBJECT
 public:
    CMakeUiCodeModelSupport(CppTools::CppModelManagerInterface *modelmanager,
                          CMakeProject *project,