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

Header cleanup in share/qtcreator/qml, specify module name.

Browse Source
This commit is contained in:
Friedemann Kleint
2011-01-24 12:30:21 +01:00
parent edb4893547
commit e39386352a
37 changed files with 221 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
share/qtcreator/qml/qmldump/main.cpp
View File

@@ -1,19 +1,22 @@
#include <QApplication> #include <QtDeclarative/QtDeclarative>
#include <QSet>
#include <QXmlStreamWriter>
#include <QXmlStreamReader>
#include <QMetaObject>
#include <QMetaProperty>
#include <QPushButton>
#include <QDebug>
#include <iostream>
#include <QtDeclarative>
#include <QtCore/private/qobject_p.h>
#include <QtCore/private/qmetaobject_p.h>
#include <QtDeclarative/private/qdeclarativemetatype_p.h> #include <QtDeclarative/private/qdeclarativemetatype_p.h>
#include <QtDeclarative/private/qdeclarativeopenmetaobject_p.h> #include <QtDeclarative/private/qdeclarativeopenmetaobject_p.h>
#include <QtDeclarative/QDeclarativeView> #include <QtDeclarative/QDeclarativeView>
#include <QtGui/QApplication>
#include <QtGui/QPushButton>
#include <QtCore/QSet>
#include <QtCore/QXmlStreamWriter>
#include <QtCore/QXmlStreamReader>
#include <QtCore/QMetaObject>
#include <QtCore/QMetaProperty>
#include <QtCore/QDebug>
#include <QtCore/private/qobject_p.h>
#include <QtCore/private/qmetaobject_p.h>
#include <iostream>
#ifdef QT_SIMULATOR #ifdef QT_SIMULATOR
#include <QtGui/private/qsimulatorconnection_p.h> #include <QtGui/private/qsimulatorconnection_p.h>
#endif #endif

5
share/qtcreator/qml/qmljsdebugger/editor/abstractformeditortool.h
View File

@@ -34,9 +34,8 @@
#ifndef ABSTRACTFORMEDITORTOOL_H #ifndef ABSTRACTFORMEDITORTOOL_H
#define ABSTRACTFORMEDITORTOOL_H #define ABSTRACTFORMEDITORTOOL_H
#include <qglobal.h> #include <QtCore/QList>
#include <QList> #include <QtCore/QObject>
#include <QObject>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QMouseEvent; class QMouseEvent;

8
share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.cpp
View File

@@ -35,11 +35,11 @@
#include "qdeclarativeviewobserver.h" #include "qdeclarativeviewobserver.h"
#include "qmlobserverconstants.h" #include "qmlobserverconstants.h"
#include <QGraphicsPolygonItem> #include <QtGui/QGraphicsPolygonItem>
#include <QTimer>
#include <QObject>
#include <QDebug> #include <QtCore/QTimer>
#include <QtCore/QObject>
#include <QtCore/QDebug>
namespace QmlJSDebugger { namespace QmlJSDebugger {

20
share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.h
View File

@@ -34,16 +34,16 @@
#ifndef BOUNDINGRECTHIGHLIGHTER_H #ifndef BOUNDINGRECTHIGHLIGHTER_H
#define BOUNDINGRECTHIGHLIGHTER_H #define BOUNDINGRECTHIGHLIGHTER_H
#include <QObject>
#include <QWeakPointer>
#include "layeritem.h" #include "layeritem.h"
QT_FORWARD_DECLARE_CLASS(QGraphicsItem); #include <QtCore/QObject>
QT_FORWARD_DECLARE_CLASS(QPainter); #include <QtCore/QWeakPointer>
QT_FORWARD_DECLARE_CLASS(QWidget);
QT_FORWARD_DECLARE_CLASS(QStyleOptionGraphicsItem); QT_FORWARD_DECLARE_CLASS(QGraphicsItem)
QT_FORWARD_DECLARE_CLASS(QTimer); QT_FORWARD_DECLARE_CLASS(QPainter)
QT_FORWARD_DECLARE_CLASS(QWidget)
QT_FORWARD_DECLARE_CLASS(QStyleOptionGraphicsItem)
QT_FORWARD_DECLARE_CLASS(QTimer)
namespace QmlJSDebugger { namespace QmlJSDebugger {
@@ -73,7 +73,7 @@ private:
void freeBoundingBox(BoundingBox *box); void freeBoundingBox(BoundingBox *box);
private: private:
Q_DISABLE_COPY(BoundingRectHighlighter); Q_DISABLE_COPY(BoundingRectHighlighter)
QDeclarativeViewObserver *m_view; QDeclarativeViewObserver *m_view;
QList<BoundingBox* > m_boxes; QList<BoundingBox* > m_boxes;
@@ -96,7 +96,7 @@ public:
QGraphicsPolygonItem *highlightPolygonEdge; QGraphicsPolygonItem *highlightPolygonEdge;
private: private:
Q_DISABLE_COPY(BoundingBox); Q_DISABLE_COPY(BoundingBox)
}; };

14
share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.cpp
View File

@@ -34,13 +34,13 @@
#include "colorpickertool.h" #include "colorpickertool.h"
#include "qdeclarativeviewobserver.h" #include "qdeclarativeviewobserver.h"
#include <QMouseEvent> #include <QtGui/QMouseEvent>
#include <QKeyEvent> #include <QtGui/QKeyEvent>
#include <QRectF> #include <QtCore/QRectF>
#include <QRgb> #include <QtGui/QRgb>
#include <QImage> #include <QtGui/QImage>
#include <QApplication> #include <QtGui/QApplication>
#include <QPalette> #include <QtGui/QPalette>
namespace QmlJSDebugger { namespace QmlJSDebugger {

4
share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.h
View File

@@ -36,9 +36,9 @@
#include "abstractformeditortool.h" #include "abstractformeditortool.h"
#include <QColor> #include <QtGui/QColor>
QT_FORWARD_DECLARE_CLASS(QPoint); QT_FORWARD_DECLARE_CLASS(QPoint)
namespace QmlJSDebugger { namespace QmlJSDebugger {

3
share/qtcreator/qml/qmljsdebugger/editor/layeritem.h
View File

@@ -34,8 +34,7 @@
#ifndef LAYERITEM_H #ifndef LAYERITEM_H
#define LAYERITEM_H #define LAYERITEM_H
#include <QGraphicsObject> #include <QtGui/QGraphicsObject>
#include <QWeakPointer>
namespace QmlJSDebugger { namespace QmlJSDebugger {

12
share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.cpp
View File

@@ -31,15 +31,15 @@
** **
**************************************************************************/ **************************************************************************/
#include <QLabel>
#include <QIcon>
#include <QAction>
#include <QMenu>
#include "qmltoolbar.h" #include "qmltoolbar.h"
#include "toolbarcolorbox.h" #include "toolbarcolorbox.h"
#include <QDebug> #include <QtGui/QLabel>
#include <QtGui/QIcon>
#include <QtGui/QAction>
#include <QtGui/QMenu>
#include <QtCore/QDebug>
namespace QmlJSDebugger { namespace QmlJSDebugger {

5
share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.h
View File

@@ -34,8 +34,9 @@
#ifndef QMLTOOLBAR_H #ifndef QMLTOOLBAR_H
#define QMLTOOLBAR_H #define QMLTOOLBAR_H
#include <QToolBar> #include <QtGui/QToolBar>
#include <QIcon> #include <QtGui/QIcon>
#include "qmlobserverconstants.h" #include "qmlobserverconstants.h"
namespace QmlJSDebugger { namespace QmlJSDebugger {

4
share/qtcreator/qml/qmljsdebugger/editor/rubberbandselectionmanipulator.cpp
View File

@@ -34,7 +34,9 @@
#include "rubberbandselectionmanipulator.h" #include "rubberbandselectionmanipulator.h"
#include "../qdeclarativeviewobserver_p.h" #include "../qdeclarativeviewobserver_p.h"
#include <QDebug> #include <QtGui/QGraphicsItem>
#include <QtCore/QDebug>
namespace QmlJSDebugger { namespace QmlJSDebugger {

4
share/qtcreator/qml/qmljsdebugger/editor/rubberbandselectionmanipulator.h
View File

@@ -37,6 +37,10 @@
#include "selectionrectangle.h" #include "selectionrectangle.h"
#include <QtCore/QPointF>
QT_FORWARD_DECLARE_CLASS(QGraphicsItem)
namespace QmlJSDebugger { namespace QmlJSDebugger {
class QDeclarativeViewObserver; class QDeclarativeViewObserver;

10
share/qtcreator/qml/qmljsdebugger/editor/selectionindicator.cpp
View File

@@ -35,10 +35,14 @@
#include "../qdeclarativeviewobserver_p.h" #include "../qdeclarativeviewobserver_p.h"
#include "qmlobserverconstants.h" #include "qmlobserverconstants.h"
#include <QPen> #include <QtCore/QDebug>
#include <QtGui/QGraphicsPolygonItem>
#include <QtGui/QGraphicsObject>
#include <QtGui/QGraphicsScene>
#include <QtGui/QPen>
#include <cmath> #include <cmath>
#include <QGraphicsScene>
#include <QDebug>
namespace QmlJSDebugger { namespace QmlJSDebugger {

12
share/qtcreator/qml/qmljsdebugger/editor/selectionindicator.h
View File

@@ -34,9 +34,15 @@
#ifndef SELECTIONINDICATOR_H #ifndef SELECTIONINDICATOR_H
#define SELECTIONINDICATOR_H #define SELECTIONINDICATOR_H
#include <QWeakPointer> #include <QtCore/QWeakPointer>
#include <QGraphicsPolygonItem> #include <QtCore/QHash>
#include <QGraphicsObject>
QT_BEGIN_NAMESPACE
class QGraphicsObject;
class QGraphicsPolygonItem;
class QGraphicsItem;
class QPolygonF;
QT_END_NAMESPACE
namespace QmlJSDebugger { namespace QmlJSDebugger {

11
share/qtcreator/qml/qmljsdebugger/editor/selectionrectangle.cpp
View File

@@ -34,11 +34,14 @@
#include "selectionrectangle.h" #include "selectionrectangle.h"
#include "qmlobserverconstants.h" #include "qmlobserverconstants.h"
#include <QPen> #include <QtGui/QPen>
#include <QGraphicsScene> #include <QtGui/QGraphicsRectItem>
#include <QtDebug> #include <QtGui/QGraphicsObject>
#include <QtGui/QGraphicsScene>
#include <QtCore/QtDebug>
#include <cmath> #include <cmath>
#include <QGraphicsScene>
namespace QmlJSDebugger { namespace QmlJSDebugger {

9
share/qtcreator/qml/qmljsdebugger/editor/selectionrectangle.h
View File

@@ -34,9 +34,12 @@
#ifndef SELECTIONRECTANGLE_H #ifndef SELECTIONRECTANGLE_H
#define SELECTIONRECTANGLE_H #define SELECTIONRECTANGLE_H
#include <QWeakPointer> #include <QtCore/QWeakPointer>
#include <QGraphicsRectItem>
#include <QGraphicsObject> QT_FORWARD_DECLARE_CLASS(QGraphicsObject)
QT_FORWARD_DECLARE_CLASS(QGraphicsRectItem)
QT_FORWARD_DECLARE_CLASS(QPointF)
QT_FORWARD_DECLARE_CLASS(QRectF)
namespace QmlJSDebugger { namespace QmlJSDebugger {

21
share/qtcreator/qml/qmljsdebugger/editor/selectiontool.cpp
View File

@@ -34,21 +34,20 @@
#include "selectiontool.h" #include "selectiontool.h"
#include "layeritem.h" #include "layeritem.h"
//#include "resizehandleitem.h"
#include "../qdeclarativeviewobserver_p.h" #include "../qdeclarativeviewobserver_p.h"
#include <QDeclarativeEngine> #include <QtGui/QApplication>
#include <QtGui/QWheelEvent>
#include <QtGui/QMouseEvent>
#include <QtGui/QClipboard>
#include <QtGui/QMenu>
#include <QtGui/QAction>
#include <QtGui/QGraphicsObject>
#include <QApplication> #include <QtDeclarative/QDeclarativeItem>
#include <QWheelEvent> #include <QtDeclarative/QDeclarativeEngine>
#include <QMouseEvent>
#include <QClipboard>
#include <QMenu>
#include <QAction>
#include <QDeclarativeItem>
#include <QGraphicsObject>
#include <QDebug> #include <QtCore/QDebug>
namespace QmlJSDebugger { namespace QmlJSDebugger {

13
share/qtcreator/qml/qmljsdebugger/editor/selectiontool.h
View File

@@ -40,14 +40,13 @@
#include "singleselectionmanipulator.h" #include "singleselectionmanipulator.h"
#include "selectionindicator.h" #include "selectionindicator.h"
#include <QHash> #include <QtCore/QList>
#include <QList> #include <QtCore/QTime>
#include <QTime>
#include <QAction>
QT_FORWARD_DECLARE_CLASS(QGraphicsItem); QT_FORWARD_DECLARE_CLASS(QGraphicsItem)
QT_FORWARD_DECLARE_CLASS(QMouseEvent); QT_FORWARD_DECLARE_CLASS(QMouseEvent)
QT_FORWARD_DECLARE_CLASS(QKeyEvent); QT_FORWARD_DECLARE_CLASS(QKeyEvent)
QT_FORWARD_DECLARE_CLASS(QAction)
namespace QmlJSDebugger { namespace QmlJSDebugger {

4
share/qtcreator/qml/qmljsdebugger/editor/singleselectionmanipulator.h
View File

@@ -34,8 +34,8 @@
#ifndef SINGLESELECTIONMANIPULATOR_H #ifndef SINGLESELECTIONMANIPULATOR_H
#define SINGLESELECTIONMANIPULATOR_H #define SINGLESELECTIONMANIPULATOR_H
#include <QPointF> #include <QtCore/QPointF>
#include <QList> #include <QtCore/QList>
QT_FORWARD_DECLARE_CLASS(QGraphicsItem); QT_FORWARD_DECLARE_CLASS(QGraphicsItem);

13
share/qtcreator/qml/qmljsdebugger/editor/subcomponenteditortool.cpp
View File

@@ -36,14 +36,13 @@
#include "subcomponentmasklayeritem.h" #include "subcomponentmasklayeritem.h"
#include "layeritem.h" #include "layeritem.h"
#include <QGraphicsItem> #include <QtGui/QGraphicsItem>
#include <QGraphicsObject> #include <QtGui/QGraphicsObject>
#include <QTimer> #include <QtGui/QMouseEvent>
#include <QMouseEvent> #include <QtGui/QKeyEvent>
#include <QKeyEvent>
#include <QDebug>
#include <QtCore/QTimer>
#include <QtCore/QDebug>
namespace QmlJSDebugger { namespace QmlJSDebugger {

4
share/qtcreator/qml/qmljsdebugger/editor/subcomponenteditortool.h
View File

@@ -35,8 +35,8 @@
#define SUBCOMPONENTEDITORTOOL_H #define SUBCOMPONENTEDITORTOOL_H
#include "abstractformeditortool.h" #include "abstractformeditortool.h"
#include <QStack> #include <QtCore/QStack>
#include <QStringList> #include <QtCore/QStringList>
QT_FORWARD_DECLARE_CLASS(QGraphicsObject) QT_FORWARD_DECLARE_CLASS(QGraphicsObject)
QT_FORWARD_DECLARE_CLASS(QPoint) QT_FORWARD_DECLARE_CLASS(QPoint)

2
share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.cpp
View File

@@ -34,7 +34,7 @@
#include "subcomponentmasklayeritem.h" #include "subcomponentmasklayeritem.h"
#include "qmlobserverconstants.h" #include "qmlobserverconstants.h"
#include "qdeclarativeviewobserver.h" #include "qdeclarativeviewobserver.h"
#include <QPolygonF> #include <QtGui/QPolygonF>
namespace QmlJSDebugger { namespace QmlJSDebugger {

2
share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.h
View File

@@ -34,7 +34,7 @@
#ifndef SUBCOMPONENTMASKLAYERITEM_H #ifndef SUBCOMPONENTMASKLAYERITEM_H
#define SUBCOMPONENTMASKLAYERITEM_H #define SUBCOMPONENTMASKLAYERITEM_H
#include <QGraphicsPolygonItem> #include <QtGui/QGraphicsPolygonItem>
namespace QmlJSDebugger { namespace QmlJSDebugger {

22
share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.cpp
View File

@@ -34,18 +34,18 @@
#include "toolbarcolorbox.h" #include "toolbarcolorbox.h"
#include "qmlobserverconstants.h" #include "qmlobserverconstants.h"
#include <QPixmap> #include <QtGui/QPixmap>
#include <QPainter> #include <QtGui/QPainter>
#include <QMenu> #include <QtGui/QMenu>
#include <QAction> #include <QtGui/QAction>
#include <QContextMenuEvent> #include <QtGui/QContextMenuEvent>
#include <QClipboard> #include <QtGui/QClipboard>
#include <QApplication> #include <QtGui/QApplication>
#include <QColorDialog> #include <QtGui/QColorDialog>
#include <QDrag> #include <QtGui/QDrag>
#include <QMimeData>
#include <QDebug> #include <QtCore/QMimeData>
#include <QtCore/QDebug>
namespace QmlJSDebugger { namespace QmlJSDebugger {

10
share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.h
View File

@@ -34,12 +34,12 @@
#ifndef ToolBarColorBox_H #ifndef ToolBarColorBox_H
#define ToolBarColorBox_H #define ToolBarColorBox_H
#include <QLabel> #include <QtGui/QLabel>
#include <QColor> #include <QtGui/QColor>
#include <QPoint> #include <QtCore/QPoint>
QT_FORWARD_DECLARE_CLASS(QContextMenuEvent); QT_FORWARD_DECLARE_CLASS(QContextMenuEvent)
QT_FORWARD_DECLARE_CLASS(QAction); QT_FORWARD_DECLARE_CLASS(QAction)
namespace QmlJSDebugger { namespace QmlJSDebugger {

14
share/qtcreator/qml/qmljsdebugger/editor/zoomtool.cpp
View File

@@ -34,14 +34,14 @@
#include "zoomtool.h" #include "zoomtool.h"
#include "../qdeclarativeviewobserver_p.h" #include "../qdeclarativeviewobserver_p.h"
#include <QMouseEvent> #include <QtGui/QMouseEvent>
#include <QWheelEvent> #include <QtGui/QWheelEvent>
#include <QKeyEvent> #include <QtGui/QKeyEvent>
#include <QRectF> #include <QtGui/QMenu>
#include <QMenu> #include <QtGui/QAction>
#include <QAction>
#include <QDebug> #include <QtCore/QRectF>
#include <QtCore/QDebug>
namespace QmlJSDebugger { namespace QmlJSDebugger {

2
share/qtcreator/qml/qmljsdebugger/include/qdeclarativeobserverservice.h
View File

@@ -46,7 +46,7 @@
#include "qmlobserverconstants.h" #include "qmlobserverconstants.h"
#include "qmljsdebugger_global.h" #include "qmljsdebugger_global.h"
#include <QHash> #include <QtCore/QHash>
QT_FORWARD_DECLARE_CLASS(QColor) QT_FORWARD_DECLARE_CLASS(QColor)
QT_FORWARD_DECLARE_CLASS(QDeclarativeEngine) QT_FORWARD_DECLARE_CLASS(QDeclarativeEngine)

12
share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h
View File

@@ -36,12 +36,14 @@
#include "qmljsdebugger_global.h" #include "qmljsdebugger_global.h"
#include "qmlobserverconstants.h" #include "qmlobserverconstants.h"
#include <qdeclarativeview.h>
#include <QWeakPointer>
QT_FORWARD_DECLARE_CLASS(QDeclarativeItem); #include <QtDeclarative/QDeclarativeView>
QT_FORWARD_DECLARE_CLASS(QMouseEvent);
QT_FORWARD_DECLARE_CLASS(QToolBar); #include <QtCore/QScopedPointer>
QT_FORWARD_DECLARE_CLASS(QDeclarativeItem)
QT_FORWARD_DECLARE_CLASS(QMouseEvent)
QT_FORWARD_DECLARE_CLASS(QToolBar)
namespace QmlJSDebugger { namespace QmlJSDebugger {

18
share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp
View File

@@ -44,15 +44,15 @@
#include "qt_private/qdeclarativedebughelper_p.h" #include "qt_private/qdeclarativedebughelper_p.h"
#include <QDeclarativeItem> #include <QtDeclarative/QDeclarativeItem>
#include <QDeclarativeEngine> #include <QtDeclarative/QDeclarativeEngine>
#include <QDeclarativeContext> #include <QtDeclarative/QDeclarativeContext>
#include <QDeclarativeExpression> #include <QtDeclarative/QDeclarativeExpression>
#include <QWidget> #include <QtGui/QWidget>
#include <QMouseEvent> #include <QtGui/QMouseEvent>
#include <QGraphicsObject> #include <QtGui/QGraphicsObject>
#include <QApplication> #include <QtGui/QApplication>
#include <QAbstractAnimation> #include <QtCore/QAbstractAnimation>
namespace QmlJSDebugger { namespace QmlJSDebugger {

5
share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver_p.h
View File

@@ -34,9 +34,8 @@
#ifndef QDECLARATIVEVIEWOBSERVER_P_H #ifndef QDECLARATIVEVIEWOBSERVER_P_H
#define QDECLARATIVEVIEWOBSERVER_P_H #define QDECLARATIVEVIEWOBSERVER_P_H
#include <QWeakPointer> #include <QtCore/QWeakPointer>
#include <QPointF> #include <QtCore/QPointF>
#include <QTimer>
#include "qdeclarativeviewobserver.h" #include "qdeclarativeviewobserver.h"
#include "qdeclarativeobserverservice.h" #include "qdeclarativeobserverservice.h"

2
share/qtcreator/qml/qmlobserver/deviceorientation.h
View File

@@ -42,7 +42,7 @@
#ifndef ORIENTATION_H #ifndef ORIENTATION_H
#define ORIENTATION_H #define ORIENTATION_H
#include <QObject> #include <QtCore/QObject>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

4
share/qtcreator/qml/qmlobserver/loggerwidget.h
View File

@@ -42,8 +42,8 @@
#ifndef LOGGERWIDGET_H #ifndef LOGGERWIDGET_H
#define LOGGERWIDGET_H #define LOGGERWIDGET_H
#include <QMainWindow> #include <QtGui/QMainWindow>
#include <QMetaType> #include <QtCore/QMetaType>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

4
share/qtcreator/qml/qmlobserver/proxysettings.cpp
View File

@@ -40,8 +40,8 @@
****************************************************************************/ ****************************************************************************/
#include <QIntValidator> #include <QtGui/QIntValidator>
#include <QSettings> #include <QtCore/QSettings>
#include "proxysettings.h" #include "proxysettings.h"

4
share/qtcreator/qml/qmlobserver/proxysettings.h
View File

@@ -42,8 +42,8 @@
#ifndef PROXYSETTINGS_H #ifndef PROXYSETTINGS_H
#define PROXYSETTINGS_H #define PROXYSETTINGS_H
#include <QDialog> #include <QtGui/QDialog>
#include <QNetworkProxy> #include <QtNetwork/QNetworkProxy>
#ifdef Q_WS_MAEMO_5 #ifdef Q_WS_MAEMO_5
#include "ui_proxysettings_maemo5.h" #include "ui_proxysettings_maemo5.h"
#else #else

17
share/qtcreator/qml/qmlobserver/qdeclarativetester.cpp
View File

@@ -40,14 +40,15 @@
****************************************************************************/ ****************************************************************************/
#include <qdeclarativetester.h> #include <qdeclarativetester.h>
#include <QDebug> #include <QtDeclarative/qdeclarativeview.h>
#include <QApplication> #include <QtDeclarative/QDeclarativeComponent>
#include <qdeclarativeview.h> #include <QtGui/QGraphicsObject>
#include <QFile> #include <QtGui/QApplication>
#include <QDeclarativeComponent> #include <QtCore/QDebug>
#include <QDir> #include <QtCore/QFile>
#include <QCryptographicHash> #include <QtCore/QDir>
#include <QGraphicsObject> #include <QtCore/QCryptographicHash>
#ifndef NO_PRIVATE_HEADERS #ifndef NO_PRIVATE_HEADERS
#include <private/qabstractanimation_p.h> #include <private/qabstractanimation_p.h>
#include <private/qdeclarativeitem_p.h> #include <private/qdeclarativeitem_p.h>

18
share/qtcreator/qml/qmlobserver/qdeclarativetester.h
View File

@@ -42,15 +42,17 @@
#ifndef QDECLARATIVETESTER_H #ifndef QDECLARATIVETESTER_H
#define QDECLARATIVETESTER_H #define QDECLARATIVETESTER_H
#include <QEvent>
#include <QMouseEvent>
#include <QKeyEvent>
#include <QImage>
#include <QUrl>
#include <qmlruntime.h> #include <qmlruntime.h>
#include <qdeclarativelist.h>
#include <qdeclarative.h> #include <QtDeclarative/qdeclarativelist.h>
#include <QAbstractAnimation> #include <QtDeclarative/qdeclarative.h>
#include <QtGui/QMouseEvent>
#include <QtGui/QKeyEvent>
#include <QtGui/QImage>
#include <QtCore/QUrl>
#include <QtCore/QEvent>
#include <QtCore/QAbstractAnimation>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

64
share/qtcreator/qml/qmlobserver/qmlruntime.cpp
View File

@@ -67,36 +67,40 @@
#include <qdeclarativeviewobserver.h> #include <qdeclarativeviewobserver.h>
#include <qdeclarativeobserverservice.h> #include <qdeclarativeobserverservice.h>
#include <QSettings> #include <QtNetwork/QNetworkReply>
#include <QXmlStreamReader> #include <QtNetwork/QNetworkCookieJar>
#include <QBuffer> #include <QtNetwork/QNetworkDiskCache>
#include <QNetworkReply> #include <QtNetwork/QNetworkAccessManager>
#include <QNetworkCookieJar> #include <QtNetwork/QNetworkProxyFactory>
#include <QNetworkDiskCache>
#include <QNetworkAccessManager> #include <QtDeclarative/QDeclarativeComponent>
#include <QSignalMapper>
#include <QDeclarativeComponent> #include <QtGui/QWidget>
#include <QWidget> #include <QtGui/QApplication>
#include <QApplication> #include <QtGui/QTextBrowser>
#include <QTranslator> #include <QtGui/QVBoxLayout>
#include <QDir> #include <QtGui/QProgressDialog>
#include <QTextBrowser> #include <QtGui/QMenuBar>
#include <QFile> #include <QtGui/QMenu>
#include <QFileInfo> #include <QtGui/QAction>
#include <QVBoxLayout> #include <QtGui/QFileDialog>
#include <QProgressDialog> #include <QtGui/QInputDialog>
#include <QProcess> #include <QtGui/QGraphicsObject>
#include <QMenuBar> #include <QtGui/QKeyEvent>
#include <QMenu>
#include <QAction> #include <QtCore/QSignalMapper>
#include <QFileDialog> #include <QtCore/QSettings>
#include <QInputDialog> #include <QtCore/QXmlStreamReader>
#include <QTimer> #include <QtCore/QBuffer>
#include <QGraphicsObject> #include <QtCore/QTranslator>
#include <QNetworkProxyFactory> #include <QtCore/QDir>
#include <QKeyEvent> #include <QtCore/QFile>
#include <QMutex> #include <QtCore/QFileInfo>
#include <QMutexLocker> #include <QtCore/QProcess>
#include <QtCore/QTimer>
#include <QtCore/QMutex>
#include <QtCore/QMutexLocker>
#include "proxysettings.h" #include "proxysettings.h"
#include "deviceorientation.h" #include "deviceorientation.h"

8
share/qtcreator/qml/qmlobserver/qmlruntime.h
View File

@@ -42,10 +42,10 @@
#ifndef QDECLARATIVEVIEWER_H #ifndef QDECLARATIVEVIEWER_H
#define QDECLARATIVEVIEWER_H #define QDECLARATIVEVIEWER_H
#include <QMainWindow> #include <QtGui/QMainWindow>
#include <QTimer> #include <QtCore/QTimer>
#include <QTime> #include <QtCore/QTime>
#include <QList> #include <QtCore/QList>
#include "loggerwidget.h" #include "loggerwidget.h"