diff options
Diffstat (limited to 'src/declarative/items')
20 files changed, 38 insertions, 43 deletions
diff --git a/src/declarative/items/context2d/context2d.pri b/src/declarative/items/context2d/context2d.pri index 60fe28dd43..31ed75d82a 100644 --- a/src/declarative/items/context2d/context2d.pri +++ b/src/declarative/items/context2d/context2d.pri @@ -1,5 +1,3 @@ -INCLUDEPATH += $$PWD - SOURCES += \ $$PWD/qsgcanvasitem.cpp \ $$PWD/qsgcontext2d.cpp \ diff --git a/src/declarative/items/context2d/qsgcanvasitem.cpp b/src/declarative/items/context2d/qsgcanvasitem.cpp index 3445cf01d0..b3b4eab30d 100644 --- a/src/declarative/items/context2d/qsgcanvasitem.cpp +++ b/src/declarative/items/context2d/qsgcanvasitem.cpp @@ -39,16 +39,16 @@ ** ****************************************************************************/ -#include "private/qsgadaptationlayer_p.h" +#include <private/qsgadaptationlayer_p.h> #include "qsgcanvasitem_p.h" -#include "qsgitem_p.h" +#include <private/qsgitem_p.h> #include "qsgcontext2d_p.h" #include "qsgcontext2dnode_p.h" #include "qsgcontext2dtexture_p.h" -#include "qdeclarativepixmapcache_p.h" +#include <private/qdeclarativepixmapcache_p.h> #include <qdeclarativeinfo.h> -#include "qdeclarativeengine_p.h" +#include <private/qdeclarativeengine_p.h> #include <QtCore/QBuffer> QT_BEGIN_NAMESPACE diff --git a/src/declarative/items/context2d/qsgcanvasitem_p.h b/src/declarative/items/context2d/qsgcanvasitem_p.h index a2dfb7968a..131a3f5fff 100644 --- a/src/declarative/items/context2d/qsgcanvasitem_p.h +++ b/src/declarative/items/context2d/qsgcanvasitem_p.h @@ -42,7 +42,7 @@ #ifndef QSGCANVASITEM_P_H #define QSGCANVASITEM_P_H -#include "qsgitem.h" +#include <qsgitem.h> #include <private/qv8engine_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/items/context2d/qsgcontext2d.cpp b/src/declarative/items/context2d/qsgcontext2d.cpp index a1248b856e..e75713de8a 100644 --- a/src/declarative/items/context2d/qsgcontext2d.cpp +++ b/src/declarative/items/context2d/qsgcontext2d.cpp @@ -42,24 +42,24 @@ #include "qsgcontext2d_p.h" #include "qsgcontext2dcommandbuffer_p.h" #include "qsgcanvasitem_p.h" -#include "qsgitem_p.h" -#include "qsgshadereffectsource_p.h" +#include <private/qsgitem_p.h> +#include <private/qsgshadereffectsource_p.h> #include <QtGui/qopenglframebufferobject.h> #include <QtCore/qdebug.h> -#include "private/qsgcontext_p.h" -#include "private/qdeclarativesvgparser_p.h" -#include "private/qdeclarativepath_p.h" +#include <private/qsgcontext_p.h> +#include <private/qdeclarativesvgparser_p.h> +#include <private/qdeclarativepath_p.h> -#include "private/qsgimage_p_p.h" +#include <private/qsgimage_p_p.h> #include <QtGui/qguiapplication.h> #include <qdeclarativeinfo.h> #include <QtCore/qmath.h> -#include "qv8engine_p.h" +#include <private/qv8engine_p.h> -#include "qdeclarativeengine.h" -#include "qv8domerrors_p.h" +#include <qdeclarativeengine.h> +#include <private/qv8domerrors_p.h> #include <QtCore/qnumeric.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp b/src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp index dff4f9fe75..9dff4e809e 100644 --- a/src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp +++ b/src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp @@ -41,7 +41,7 @@ #include "qsgcontext2dcommandbuffer_p.h" #include "qsgcanvasitem_p.h" -#include "qdeclarative.h" +#include <qdeclarative.h> #include <QtCore/QMutex> #define HAS_SHADOW(offsetX, offsetY, blur, color) (color.isValid() && color.alpha() && (blur || offsetX || offsetY)) diff --git a/src/declarative/items/context2d/qsgcontext2dcommandbuffer_p.h b/src/declarative/items/context2d/qsgcontext2dcommandbuffer_p.h index 95d0e9685e..cab82e2f67 100644 --- a/src/declarative/items/context2d/qsgcontext2dcommandbuffer_p.h +++ b/src/declarative/items/context2d/qsgcontext2dcommandbuffer_p.h @@ -43,7 +43,7 @@ #define QSGCONTEXT2DCOMMANDBUFFER_P_H #include "qsgcontext2d_p.h" -#include "qdeclarativepixmapcache_p.h" +#include <private/qdeclarativepixmapcache_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/items/context2d/qsgcontext2dnode_p.h b/src/declarative/items/context2d/qsgcontext2dnode_p.h index 957c14b138..88c3619095 100644 --- a/src/declarative/items/context2d/qsgcontext2dnode_p.h +++ b/src/declarative/items/context2d/qsgcontext2dnode_p.h @@ -42,8 +42,8 @@ #ifndef QSGCONTEXT2DNODE_P_H #define QSGCONTEXT2DNODE_P_H -#include "qsgnode.h" -#include "qsgtexturematerial.h" +#include <qsgnode.h> +#include <qsgtexturematerial.h> #include "qsgcanvasitem_p.h" #include "qsgcontext2dtexture_p.h" diff --git a/src/declarative/items/context2d/qsgcontext2dtexture.cpp b/src/declarative/items/context2d/qsgcontext2dtexture.cpp index 8e22cebe70..a57a5e5fba 100644 --- a/src/declarative/items/context2d/qsgcontext2dtexture.cpp +++ b/src/declarative/items/context2d/qsgcontext2dtexture.cpp @@ -42,8 +42,8 @@ #include "qsgcontext2dtexture_p.h" #include "qsgcontext2dtile_p.h" #include "qsgcanvasitem_p.h" -#include "qsgitem_p.h" -#include "private/qsgtexture_p.h" +#include <private/qsgitem_p.h> +#include <private/qsgtexture_p.h> #include "qsgcontext2dcommandbuffer_p.h" #include <QOpenGLPaintDevice> diff --git a/src/declarative/items/context2d/qsgcontext2dtexture_p.h b/src/declarative/items/context2d/qsgcontext2dtexture_p.h index 1555120320..dbc383d7fc 100644 --- a/src/declarative/items/context2d/qsgcontext2dtexture_p.h +++ b/src/declarative/items/context2d/qsgcontext2dtexture_p.h @@ -42,7 +42,7 @@ #ifndef QSGCONTEXT2DTEXTURE_P_H #define QSGCONTEXT2DTEXTURE_P_H -#include "qsgtexture.h" +#include <qsgtexture.h> #include "qsgcanvasitem_p.h" #include "qsgcontext2d_p.h" diff --git a/src/declarative/items/items.pri b/src/declarative/items/items.pri index 355a762764..025f67ab90 100644 --- a/src/declarative/items/items.pri +++ b/src/declarative/items/items.pri @@ -1,5 +1,3 @@ -INCLUDEPATH += $$PWD - HEADERS += \ $$PWD/qsgevents_p_p.h \ $$PWD/qsgitemchangelistener_p.h \ diff --git a/src/declarative/items/qsganimation.cpp b/src/declarative/items/qsganimation.cpp index e57edbd2c8..b0dc820763 100644 --- a/src/declarative/items/qsganimation.cpp +++ b/src/declarative/items/qsganimation.cpp @@ -43,8 +43,8 @@ #include "qsganimation_p_p.h" #include "qsgstateoperations_p.h" -#include <qdeclarativeproperty_p.h> -#include <qdeclarativepath_p.h> +#include <private/qdeclarativeproperty_p.h> +#include <private/qdeclarativepath_p.h> #include <QtDeclarative/qdeclarativeinfo.h> #include <QtCore/qmath.h> diff --git a/src/declarative/items/qsgimplicitsizeitem.cpp b/src/declarative/items/qsgimplicitsizeitem.cpp index 34890d876a..163b73b39c 100644 --- a/src/declarative/items/qsgimplicitsizeitem.cpp +++ b/src/declarative/items/qsgimplicitsizeitem.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "private/qsgimplicitsizeitem_p.h" -#include "private/qsgimplicitsizeitem_p_p.h" +#include "qsgimplicitsizeitem_p.h" +#include "qsgimplicitsizeitem_p_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/items/qsgimplicitsizeitem_p_p.h b/src/declarative/items/qsgimplicitsizeitem_p_p.h index 30631de62c..3ddd69d7d3 100644 --- a/src/declarative/items/qsgimplicitsizeitem_p_p.h +++ b/src/declarative/items/qsgimplicitsizeitem_p_p.h @@ -54,9 +54,9 @@ // We mean it. // -#include "private/qsgitem_p.h" -#include "private/qsgpainteditem_p.h" -#include "private/qsgimplicitsizeitem_p.h" +#include "qsgitem_p.h" +#include "qsgpainteditem_p.h" +#include "qsgimplicitsizeitem_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/items/qsgitemsmodule.cpp b/src/declarative/items/qsgitemsmodule.cpp index 5a99ef78fb..bb471dd05a 100644 --- a/src/declarative/items/qsgitemsmodule.cpp +++ b/src/declarative/items/qsgitemsmodule.cpp @@ -73,9 +73,9 @@ #include "qsganimation_p.h" #include <private/qsgshadereffect_p.h> #include <private/qsgshadereffectsource_p.h> -//#include "private/qsgpincharea_p.h" -#include "qsgcanvasitem_p.h" -#include "qsgcontext2d_p.h" +//#include <private/qsgpincharea_p.h> +#include <private/qsgcanvasitem_p.h> +#include <private/qsgcontext2d_p.h> #include "qsgsprite_p.h" #include "qsgspriteimage_p.h" #include "qsgdrag_p.h" diff --git a/src/declarative/items/qsgloader_p_p.h b/src/declarative/items/qsgloader_p_p.h index ea8c11d413..36059ca51a 100644 --- a/src/declarative/items/qsgloader_p_p.h +++ b/src/declarative/items/qsgloader_p_p.h @@ -57,7 +57,7 @@ #include "qsgloader_p.h" #include "qsgimplicitsizeitem_p_p.h" #include "qsgitemchangelistener_p.h" -#include "qdeclarativeincubator.h" +#include <qdeclarativeincubator.h> #include <private/qv8_p.h> diff --git a/src/declarative/items/qsgshadereffect.cpp b/src/declarative/items/qsgshadereffect.cpp index f4ad80ea1e..81adf8d705 100644 --- a/src/declarative/items/qsgshadereffect.cpp +++ b/src/declarative/items/qsgshadereffect.cpp @@ -49,8 +49,8 @@ #include <private/qsgtextureprovider_p.h> #include "qsgcanvas.h" -#include <qsgimage_p.h> -#include <qsgshadereffectsource_p.h> +#include "qsgimage_p.h" +#include "qsgshadereffectsource_p.h" #include <QtCore/qsignalmapper.h> #include <QtGui/qopenglframebufferobject.h> diff --git a/src/declarative/items/qsgtextinput.cpp b/src/declarative/items/qsgtextinput.cpp index 3f1d95a4fc..e6e2d21773 100644 --- a/src/declarative/items/qsgtextinput.cpp +++ b/src/declarative/items/qsgtextinput.cpp @@ -49,7 +49,7 @@ #include <QtDeclarative/qdeclarativeinfo.h> #include <QtGui/qevent.h> #include <QTextBoundaryFinder> -#include <qsgtextnode_p.h> +#include "qsgtextnode_p.h" #include <qsgsimplerectnode.h> #include <QtGui/qstylehints.h> diff --git a/src/declarative/items/qsgtextnode_p.h b/src/declarative/items/qsgtextnode_p.h index b49a8a18e4..7a9462c24e 100644 --- a/src/declarative/items/qsgtextnode_p.h +++ b/src/declarative/items/qsgtextnode_p.h @@ -43,7 +43,7 @@ #define QSGTEXTNODE_P_H #include <qsgnode.h> -#include <qsgtext_p.h> +#include "qsgtext_p.h" #include <qglyphrun.h> #include <QtGui/qcolor.h> diff --git a/src/declarative/items/qsgview_p.h b/src/declarative/items/qsgview_p.h index 3f8d69e8c0..f2b962c28e 100644 --- a/src/declarative/items/qsgview_p.h +++ b/src/declarative/items/qsgview_p.h @@ -48,9 +48,8 @@ #include <QtCore/qelapsedtimer.h> #include <QtCore/qtimer.h> #include <QtCore/qpointer.h> -#include <QtDeclarative/qsgview.h> #include <QtDeclarative/qdeclarativeengine.h> -#include <QtDeclarative/private/qsgcanvas_p.h> +#include "qsgcanvas_p.h" #include "qsgitemchangelistener_p.h" diff --git a/src/declarative/items/qsgvisualadaptormodel_p.h b/src/declarative/items/qsgvisualadaptormodel_p.h index bc9d3881fc..43af78b37e 100644 --- a/src/declarative/items/qsgvisualadaptormodel_p.h +++ b/src/declarative/items/qsgvisualadaptormodel_p.h @@ -45,7 +45,7 @@ #include <QtCore/qobject.h> #include <QtCore/qabstractitemmodel.h> -#include <QtDeclarative/private/qdeclarativerefcount_p.h> +#include <private/qdeclarativerefcount_p.h> QT_BEGIN_HEADER |