feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.7'

Browse Source 
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp

Change-Id: I7f319154d5865c47ccfd5f525f0fd7983733dd0e
This commit is contained in:
Eike Ziller
2013-05-03 09:49:28 +02:00
parent 364c95476e 6999e3c339
commit a2171c2d82
37 changed files with 178 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cpptools/abstracteditorsupport.h
View File

@@ -33,12 +33,14 @@
#include "cpptools_global.h"
#include <QString>
#include <QObject>
namespace CppTools {
class CppModelManagerInterface;
class CPPTOOLS_EXPORT AbstractEditorSupport
class CPPTOOLS_EXPORT AbstractEditorSupport : public QObject
{
Q_OBJECT
public:
explicit AbstractEditorSupport(CppModelManagerInterface *modelmanager);
virtual ~AbstractEditorSupport();