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

Fix compilation with namespaced Qt.

Browse Source
This commit is contained in:
ck
2010-02-17 11:56:12 +01:00
parent b5646d35da
commit 96690963d3
7 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/debugger/debuggermainwindow.h
View File

@@ -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 {

8
src/plugins/debugger/debuggeruiswitcher.h
View File

@@ -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;

2
src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
View File

@@ -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 {

2
src/plugins/qmldesigner/components/itemlibrary/itemlibrarytreeview.h
View File

@@ -36,7 +36,7 @@
#include <QDebug> #include <QDebug>
#include <QTimeLine> #include <QTimeLine>
class QLabel; QT_FORWARD_DECLARE_CLASS(QLabel);
namespace QmlDesigner { namespace QmlDesigner {

4
src/plugins/qmlinspector/inspectoroutputpane.h
View File

@@ -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 {

3
src/plugins/qmlinspector/qmlinspector.h
View File

@@ -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:
} }
QT_END_NAMESPACE
#endif #endif

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

@@ -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 ProjectExplorer {
class Project;
}
namespace Core { namespace Core {
class IMode; class IMode;
} }
namespace ProjectExplorer {
class Project;
}
namespace Qml { namespace Qml {
class QmlInspector; class QmlInspector;
class InspectorOutputPane; class InspectorOutputPane;
@@ -83,6 +81,4 @@ private:
} }
QT_END_NAMESPACE
#endif // QMLINSPECTORPLUGIN_H #endif // QMLINSPECTORPLUGIN_H