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

Conflicts:
	src/plugins/qmlinspector/qmlinspectorplugin.h

diff --cc src/plugins/qmlinspector/qmlinspectorplugin.h
index 240092e,e65e2c5..77f17d0
--- 1/src/plugins/qmlinspector/qmlinspectorplugin.h
--- 2/src/plugins/qmlinspector/qmlinspectorplugin.h
+++ b/src/plugins/qmlinspector/qmlinspectorplugin.h
@@@ -33,23 -33,19 +33,25 @@@
  
  #include <QtCore/QObject>
  #include <QtCore/QPointer>
 -
 -namespace Core
 -{
 -    class IMode;
 -}
 -
 +#include <QtCore/QTimer>
  
+ QT_BEGIN_NAMESPACE
+ 
  class QStringList;
  
 -class QmlInspectorMode;
 -class InspectorOutputPane;
 +namespace ProjectExplorer {
 +    class Project;
 +}
 +
 +namespace Core {
 +    class IMode;
 +}
 +
 +namespace Qml {
 +    class QmlInspector;
 +    class InspectorOutputPane;
 +
 +const int MaxConnectionAttempts = 20;
  
  class QmlInspectorPlugin : public ExtensionSystem::IPlugin
  {