aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2012-04-24 17:44:07 +0200
committerKai Koehne <kai.koehne@nokia.com>2012-04-25 08:36:14 +0200
commitb834de670d721de1ff05fea7326cdc200ff19bf4 (patch)
treed635ed8c5bc22651deacdf339a301b42f88c7650
parent2aec3d554ce8e8c424a0f7b707151fff49724b21 (diff)
QmlJsInspector: Fix compilation breakage on Windows
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>
-rw-r--r--src/plugins/debugger/qml/qmladapter.h4
-rw-r--r--src/plugins/qmljsinspector/qmljsclientproxy.h3
-rw-r--r--src/plugins/qmljsinspector/qmljsinspector.h4
-rw-r--r--src/plugins/qmljsinspector/qmljslivetextpreview.h3
-rw-r--r--src/plugins/qmljsinspector/qmljspropertyinspector.h4
5 files changed, 10 insertions, 8 deletions
diff --git a/src/plugins/debugger/qml/qmladapter.h b/src/plugins/debugger/qml/qmladapter.h
index 67033ba4e3..266f55ff94 100644
--- a/src/plugins/debugger/qml/qmladapter.h
+++ b/src/plugins/debugger/qml/qmladapter.h
@@ -45,6 +45,8 @@ class QmlDebugConnection;
class QDebugMessageClient;
}
+using namespace QmlDebug;
+
namespace Debugger {
class DebuggerEngine;
@@ -54,8 +56,6 @@ class BaseQmlDebuggerClient;
class QmlAdapterPrivate;
} // namespace Internal
-using namespace QmlDebug;
-
class DEBUGGER_EXPORT QmlAdapter : public QObject
{
Q_OBJECT
diff --git a/src/plugins/qmljsinspector/qmljsclientproxy.h b/src/plugins/qmljsinspector/qmljsclientproxy.h
index f89f41b310..3869b5d2d9 100644
--- a/src/plugins/qmljsinspector/qmljsclientproxy.h
+++ b/src/plugins/qmljsinspector/qmljsclientproxy.h
@@ -38,6 +38,8 @@
QT_FORWARD_DECLARE_CLASS(QUrl)
+using namespace QmlDebug;
+
namespace Debugger {
class QmlAdapter;
}
@@ -53,7 +55,6 @@ namespace Internal {
class InspectorPlugin;
class QmlToolsClient;
-using namespace QmlDebug;
class ClientProxy : public QObject
{
diff --git a/src/plugins/qmljsinspector/qmljsinspector.h b/src/plugins/qmljsinspector/qmljsinspector.h
index c755f66669..e7864a0bb8 100644
--- a/src/plugins/qmljsinspector/qmljsinspector.h
+++ b/src/plugins/qmljsinspector/qmljsinspector.h
@@ -46,6 +46,8 @@
#include <QAction>
#include <QObject>
+using namespace QmlDebug;
+
namespace ProjectExplorer {
class Project;
class Environment;
@@ -73,8 +75,6 @@ class InspectorSettings;
class ContextCrumblePath;
class QmlJSLiveTextPreview;
-using namespace QmlDebug;
-
class InspectorUi : public QObject
{
Q_OBJECT
diff --git a/src/plugins/qmljsinspector/qmljslivetextpreview.h b/src/plugins/qmljsinspector/qmljslivetextpreview.h
index 54f29fcc44..e1ba4ed5ab 100644
--- a/src/plugins/qmljsinspector/qmljslivetextpreview.h
+++ b/src/plugins/qmljsinspector/qmljslivetextpreview.h
@@ -43,6 +43,8 @@
QT_FORWARD_DECLARE_CLASS(QTextDocument)
+using namespace QmlDebug;
+
namespace Core {
class IEditor;
}
@@ -56,7 +58,6 @@ namespace Internal {
class ClientProxy;
-using namespace QmlDebug;
class QmlJSLiveTextPreview : public QObject
{
diff --git a/src/plugins/qmljsinspector/qmljspropertyinspector.h b/src/plugins/qmljsinspector/qmljspropertyinspector.h
index 97fa5efbd0..64366d2f91 100644
--- a/src/plugins/qmljsinspector/qmljspropertyinspector.h
+++ b/src/plugins/qmljsinspector/qmljspropertyinspector.h
@@ -41,6 +41,8 @@
#include "customcolordialog.h"
+using namespace QmlDebug;
+
namespace Utils {
class SavedAction;
}
@@ -48,8 +50,6 @@ class SavedAction;
namespace QmlJSInspector {
namespace Internal {
-using namespace QmlDebug;
-
class PropertyEditDelegate;
class ExpressionEdit : public QDialog