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/qmlinspector/qmlinspectorplugin.h
This commit is contained in:
Lasse Holmstedt
2010-02-16 16:55:47 +01:00
parent 4e5089d90d 2791cfbdd1
commit 8c2928e12e
85 changed files with 2275 additions and 835 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmlinspector/qmlinspectorplugin.h
View File

@@ -35,6 +35,8 @@
#include <QtCore/QPointer>
#include <QtCore/QTimer>
QT_BEGIN_NAMESPACE
class QStringList;
namespace ProjectExplorer {