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

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

Browse Source 
Conflicts:
	src/plugins/perforce/perforceplugin.cpp
This commit is contained in:
mae
2009-01-23 14:41:33 +01:00
parent 9df3494278 6d679fd6d9
commit 1b345cfa0f
122 changed files with 1621 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/coreplugin/scriptmanager/scriptmanager_p.h
View File

@@ -35,13 +35,15 @@
#define SCRIPTMANAGER_P_H
#include <coreplugin/scriptmanager/scriptmanager.h>
#include <coreplugin/icore.h>
#include <QtCore/QObject>
#include <QtCore/QList>
#include <QtScript/QScriptEngine>
namespace Core {
class ICore;
namespace Internal {
class ScriptManagerPrivate : public Core::ScriptManager