Skip to content
Snippets Groups Projects
Commit 96690963 authored by ck's avatar ck
Browse files

Fix compilation with namespaced Qt.

parent b5646d35
No related branches found
No related tags found
No related merge requests found
...@@ -4,8 +4,7 @@ ...@@ -4,8 +4,7 @@
#include "debuggeruiswitcher.h" #include "debuggeruiswitcher.h"
#include <utils/fancymainwindow.h> #include <utils/fancymainwindow.h>
QT_FORWARD_DECLARE_CLASS(QMenu);
class QMenu;
namespace Debugger { namespace Debugger {
......
...@@ -13,10 +13,10 @@ namespace Core { ...@@ -13,10 +13,10 @@ namespace Core {
class Command; class Command;
} }
class QAction; QT_FORWARD_DECLARE_CLASS(Action);
class QDockWidget; QT_FORWARD_DECLARE_CLASS(QDockWidget);
class QStackedWidget; QT_FORWARD_DECLARE_CLASS(QStackedWidget);
class QComboBox; QT_FORWARD_DECLARE_CLASS(QComboBox);
namespace Debugger { namespace Debugger {
class DebuggerMainWindow; class DebuggerMainWindow;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include <QScriptEngine> #include <QScriptEngine>
#include <private/qmllistmodel_p.h> #include <private/qmllistmodel_p.h>
class QMimeData; QT_FORWARD_DECLARE_CLASS(QMimeData);
namespace QmlDesigner { namespace QmlDesigner {
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <QDebug> #include <QDebug>
#include <QTimeLine> #include <QTimeLine>
class QLabel; QT_FORWARD_DECLARE_CLASS(QLabel);
namespace QmlDesigner { namespace QmlDesigner {
......
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
#include <QtCore/QObject> #include <QtCore/QObject>
class QTextEdit; QT_FORWARD_DECLARE_CLASS(QTextEdit);
class RunControl; QT_FORWARD_DECLARE_CLASS(RunControl);
namespace Qml { namespace Qml {
......
...@@ -55,6 +55,7 @@ class ObjectPropertiesView; ...@@ -55,6 +55,7 @@ class ObjectPropertiesView;
class CanvasFrameRate; class CanvasFrameRate;
class ExpressionQueryWidget; class ExpressionQueryWidget;
QT_END_NAMESPACE
namespace Qml { namespace Qml {
class EngineSpinBox; class EngineSpinBox;
...@@ -112,6 +113,4 @@ private: ...@@ -112,6 +113,4 @@ private:
} }
QT_END_NAMESPACE
#endif #endif
...@@ -35,18 +35,16 @@ ...@@ -35,18 +35,16 @@
#include <QtCore/QPointer> #include <QtCore/QPointer>
#include <QtCore/QTimer> #include <QtCore/QTimer>
QT_BEGIN_NAMESPACE QT_FORWARD_DECLARE_CLASS(QStringList);
class QStringList; namespace Core {
class IMode;
}
namespace ProjectExplorer { namespace ProjectExplorer {
class Project; class Project;
} }
namespace Core {
class IMode;
}
namespace Qml { namespace Qml {
class QmlInspector; class QmlInspector;
class InspectorOutputPane; class InspectorOutputPane;
...@@ -83,6 +81,4 @@ private: ...@@ -83,6 +81,4 @@ private:
} }
QT_END_NAMESPACE
#endif // QMLINSPECTORPLUGIN_H #endif // QMLINSPECTORPLUGIN_H
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment