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

QmlJsInspector: Fix compilation breakage on Windows

Browse Source 
MSVC doesn't take the 'using namespace' into account in moc file
(that isn't in a particular namespace).
Move it out of QmlJSDebugger::Internal.

Change-Id: Iee4a89a9ecf38607791e1ccf884a15cb8b0892a7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Kai Koehne
2012-04-24 17:44:07 +02:00
parent 2aec3d554c
commit b834de670d
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/qml/qmladapter.h
View File

@@ -45,6 +45,8 @@ class QmlDebugConnection;
class QDebugMessageClient; class QDebugMessageClient;
} }
using namespace QmlDebug;
namespace Debugger { namespace Debugger {
class DebuggerEngine; class DebuggerEngine;
@@ -54,8 +56,6 @@ class BaseQmlDebuggerClient;
class QmlAdapterPrivate; class QmlAdapterPrivate;
} // namespace Internal } // namespace Internal
using namespace QmlDebug;
class DEBUGGER_EXPORT QmlAdapter : public QObject class DEBUGGER_EXPORT QmlAdapter : public QObject
{ {
Q_OBJECT Q_OBJECT

3
src/plugins/qmljsinspector/qmljsclientproxy.h
View File

@@ -38,6 +38,8 @@
QT_FORWARD_DECLARE_CLASS(QUrl) QT_FORWARD_DECLARE_CLASS(QUrl)
using namespace QmlDebug;
namespace Debugger { namespace Debugger {
class QmlAdapter; class QmlAdapter;
} }
@@ -53,7 +55,6 @@ namespace Internal {
class InspectorPlugin; class InspectorPlugin;
class QmlToolsClient; class QmlToolsClient;
using namespace QmlDebug;
class ClientProxy : public QObject class ClientProxy : public QObject
{ {

4
src/plugins/qmljsinspector/qmljsinspector.h
View File

@@ -46,6 +46,8 @@
#include <QAction> #include <QAction>
#include <QObject> #include <QObject>
using namespace QmlDebug;
namespace ProjectExplorer { namespace ProjectExplorer {
class Project; class Project;
class Environment; class Environment;
@@ -73,8 +75,6 @@ class InspectorSettings;
class ContextCrumblePath; class ContextCrumblePath;
class QmlJSLiveTextPreview; class QmlJSLiveTextPreview;
using namespace QmlDebug;
class InspectorUi : public QObject class InspectorUi : public QObject
{ {
Q_OBJECT Q_OBJECT

3
src/plugins/qmljsinspector/qmljslivetextpreview.h
View File

@@ -43,6 +43,8 @@
QT_FORWARD_DECLARE_CLASS(QTextDocument) QT_FORWARD_DECLARE_CLASS(QTextDocument)
using namespace QmlDebug;
namespace Core { namespace Core {
class IEditor; class IEditor;
} }
@@ -56,7 +58,6 @@ namespace Internal {
class ClientProxy; class ClientProxy;
using namespace QmlDebug;
class QmlJSLiveTextPreview : public QObject class QmlJSLiveTextPreview : public QObject
{ {

4
src/plugins/qmljsinspector/qmljspropertyinspector.h
View File

@@ -41,6 +41,8 @@
#include "customcolordialog.h" #include "customcolordialog.h"
using namespace QmlDebug;
namespace Utils { namespace Utils {
class SavedAction; class SavedAction;
} }
@@ -48,8 +50,6 @@ class SavedAction;
namespace QmlJSInspector { namespace QmlJSInspector {
namespace Internal { namespace Internal {
using namespace QmlDebug;
class PropertyEditDelegate; class PropertyEditDelegate;
class ExpressionEdit : public QDialog class ExpressionEdit : public QDialog