diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 10:02:02 +0100 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 10:02:32 +0100 |
commit | 3c5cef4fdec28ab4adfb24f75f2fd7f3fca7b3b0 (patch) | |
tree | 7dfd894311ad904b50c35470f24479c5f5fa43ec /src/declarative/graphicsitems | |
parent | b35d793648a24b229aac75ea43d5a175967304ca (diff) | |
parent | 14166395053bf93a561d87846d172515e5325882 (diff) |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Change-Id: Ic10a8c118053323004cafe1b4bffd990a16aaf7f
Diffstat (limited to 'src/declarative/graphicsitems')
33 files changed, 2 insertions, 123 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeanchors_p.h b/src/declarative/graphicsitems/qdeclarativeanchors_p.h index fe23bfd3..0ced6746 100644 --- a/src/declarative/graphicsitems/qdeclarativeanchors_p.h +++ b/src/declarative/graphicsitems/qdeclarativeanchors_p.h @@ -50,8 +50,6 @@ #include <private/qtdeclarativeglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -199,6 +197,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeAnchors) -QT_END_HEADER - #endif diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h index 5f70491c..9ab6456c 100644 --- a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h +++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h @@ -46,8 +46,6 @@ #ifndef QT_NO_MOVIE -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -109,8 +107,6 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeAnimatedImage) -QT_END_HEADER - #endif // QT_NO_MOVIE #endif diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage_p.h b/src/declarative/graphicsitems/qdeclarativeborderimage_p.h index 9cdb73cc..c73e0c19 100644 --- a/src/declarative/graphicsitems/qdeclarativeborderimage_p.h +++ b/src/declarative/graphicsitems/qdeclarativeborderimage_p.h @@ -46,7 +46,6 @@ #include <QtNetwork/qnetworkreply.h> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -104,6 +103,5 @@ private: QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeBorderImage) -QT_END_HEADER #endif // QDECLARATIVEBORDERIMAGE_H diff --git a/src/declarative/graphicsitems/qdeclarativeflickable_p.h b/src/declarative/graphicsitems/qdeclarativeflickable_p.h index d1f45539..fbe809be 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable_p.h +++ b/src/declarative/graphicsitems/qdeclarativeflickable_p.h @@ -44,8 +44,6 @@ #include "qdeclarativeitem.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -224,6 +222,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeFlickable) -QT_END_HEADER - #endif diff --git a/src/declarative/graphicsitems/qdeclarativeflipable_p.h b/src/declarative/graphicsitems/qdeclarativeflipable_p.h index 9bd65986..eebfa57e 100644 --- a/src/declarative/graphicsitems/qdeclarativeflipable_p.h +++ b/src/declarative/graphicsitems/qdeclarativeflipable_p.h @@ -48,8 +48,6 @@ #include <QtGui/QTransform> #include <QtGui/qvector3d.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -95,6 +93,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeFlipable) -QT_END_HEADER - #endif // QDECLARATIVEFLIPABLE_H diff --git a/src/declarative/graphicsitems/qdeclarativefocuspanel_p.h b/src/declarative/graphicsitems/qdeclarativefocuspanel_p.h index c65f30b4..1b0fed65 100644 --- a/src/declarative/graphicsitems/qdeclarativefocuspanel_p.h +++ b/src/declarative/graphicsitems/qdeclarativefocuspanel_p.h @@ -44,8 +44,6 @@ #include "qdeclarativeitem.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -73,6 +71,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeFocusPanel) -QT_END_HEADER - #endif // QDECLARATIVEFOCUSPANEL_H diff --git a/src/declarative/graphicsitems/qdeclarativefocusscope_p.h b/src/declarative/graphicsitems/qdeclarativefocusscope_p.h index d12f9e97..fe152118 100644 --- a/src/declarative/graphicsitems/qdeclarativefocusscope_p.h +++ b/src/declarative/graphicsitems/qdeclarativefocusscope_p.h @@ -44,8 +44,6 @@ #include "qdeclarativeitem.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -64,6 +62,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeFocusScope) -QT_END_HEADER - #endif // QDECLARATIVEFOCUSSCOPE_H diff --git a/src/declarative/graphicsitems/qdeclarativegraphicswidget_p.h b/src/declarative/graphicsitems/qdeclarativegraphicswidget_p.h index 30c634c4..987399b5 100644 --- a/src/declarative/graphicsitems/qdeclarativegraphicswidget_p.h +++ b/src/declarative/graphicsitems/qdeclarativegraphicswidget_p.h @@ -45,8 +45,6 @@ #include <QObject> #include <QtDeclarative/qdeclarativecomponent.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -85,6 +83,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEGRAPHICSWIDGET_P_H diff --git a/src/declarative/graphicsitems/qdeclarativegridview_p.h b/src/declarative/graphicsitems/qdeclarativegridview_p.h index 4e882b40..9bdfcfa7 100644 --- a/src/declarative/graphicsitems/qdeclarativegridview_p.h +++ b/src/declarative/graphicsitems/qdeclarativegridview_p.h @@ -45,8 +45,6 @@ #include "private/qdeclarativeflickable_p.h" #include "private/qdeclarativeguard_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -281,6 +279,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeGridView) QML_DECLARE_TYPEINFO(QDeclarativeGridView, QML_HAS_ATTACHED_PROPERTIES) -QT_END_HEADER - #endif diff --git a/src/declarative/graphicsitems/qdeclarativeimage_p.h b/src/declarative/graphicsitems/qdeclarativeimage_p.h index 5568561b..dee98c7d 100644 --- a/src/declarative/graphicsitems/qdeclarativeimage_p.h +++ b/src/declarative/graphicsitems/qdeclarativeimage_p.h @@ -46,7 +46,6 @@ #include <QtNetwork/qnetworkreply.h> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -95,6 +94,5 @@ private: QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeImage) -QT_END_HEADER #endif // QDECLARATIVEIMAGE_H diff --git a/src/declarative/graphicsitems/qdeclarativeimagebase_p.h b/src/declarative/graphicsitems/qdeclarativeimagebase_p.h index 7d56a027..ff771d93 100644 --- a/src/declarative/graphicsitems/qdeclarativeimagebase_p.h +++ b/src/declarative/graphicsitems/qdeclarativeimagebase_p.h @@ -44,8 +44,6 @@ #include "qdeclarativeimplicitsizeitem_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDeclarativeImageBasePrivate; @@ -111,6 +109,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEIMAGEBASE_H diff --git a/src/declarative/graphicsitems/qdeclarativeimplicitsizeitem_p.h b/src/declarative/graphicsitems/qdeclarativeimplicitsizeitem_p.h index 3a261a10..629bbf7a 100644 --- a/src/declarative/graphicsitems/qdeclarativeimplicitsizeitem_p.h +++ b/src/declarative/graphicsitems/qdeclarativeimplicitsizeitem_p.h @@ -44,8 +44,6 @@ #include "qdeclarativepainteditem_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDeclarativeImplicitSizeItemPrivate; @@ -95,6 +93,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEIMPLICITSIZEITEM_H diff --git a/src/declarative/graphicsitems/qdeclarativeitem.h b/src/declarative/graphicsitems/qdeclarativeitem.h index 6d5cd8be..47647d08 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.h +++ b/src/declarative/graphicsitems/qdeclarativeitem.h @@ -52,8 +52,6 @@ #include <QtGui/qfont.h> #include <QtWidgets/qaction.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -231,6 +229,4 @@ QML_DECLARE_TYPE(QGraphicsWidget) QML_DECLARE_TYPE(QAction) #endif -QT_END_HEADER - #endif // QDECLARATIVEITEM_H diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule_p.h b/src/declarative/graphicsitems/qdeclarativeitemsmodule_p.h index 8a37e020..f7750c1e 100644 --- a/src/declarative/graphicsitems/qdeclarativeitemsmodule_p.h +++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule_p.h @@ -44,8 +44,6 @@ #include <qdeclarative.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -59,6 +57,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEITEMMODULE_H diff --git a/src/declarative/graphicsitems/qdeclarativelayoutitem_p.h b/src/declarative/graphicsitems/qdeclarativelayoutitem_p.h index 35e02e52..cc84830f 100644 --- a/src/declarative/graphicsitems/qdeclarativelayoutitem_p.h +++ b/src/declarative/graphicsitems/qdeclarativelayoutitem_p.h @@ -46,8 +46,6 @@ #include <QGraphicsLayoutItem> #include <QSizeF> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -90,5 +88,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeLayoutItem) -QT_END_HEADER #endif diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp index 33d3db35..08e76363 100644 --- a/src/declarative/graphicsitems/qdeclarativelistview.cpp +++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp @@ -896,6 +896,8 @@ void QDeclarativeListViewPrivate::layout() fixupPosition(); q->refill(); } + if (sectionCriteria) + updateCurrentSection(); if (header) updateHeader(); if (footer) diff --git a/src/declarative/graphicsitems/qdeclarativelistview_p.h b/src/declarative/graphicsitems/qdeclarativelistview_p.h index dc5949cd..339c4960 100644 --- a/src/declarative/graphicsitems/qdeclarativelistview_p.h +++ b/src/declarative/graphicsitems/qdeclarativelistview_p.h @@ -45,8 +45,6 @@ #include "private/qdeclarativeflickable_p.h" #include "private/qdeclarativeguard_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -365,6 +363,4 @@ QML_DECLARE_TYPEINFO(QDeclarativeListView, QML_HAS_ATTACHED_PROPERTIES) QML_DECLARE_TYPE(QDeclarativeListView) QML_DECLARE_TYPE(QDeclarativeViewSection) -QT_END_HEADER - #endif diff --git a/src/declarative/graphicsitems/qdeclarativeloader_p.h b/src/declarative/graphicsitems/qdeclarativeloader_p.h index 894c4563..623ed757 100644 --- a/src/declarative/graphicsitems/qdeclarativeloader_p.h +++ b/src/declarative/graphicsitems/qdeclarativeloader_p.h @@ -44,8 +44,6 @@ #include "qdeclarativeimplicitsizeitem_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -103,6 +101,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeLoader) -QT_END_HEADER - #endif // QDECLARATIVELOADER_H diff --git a/src/declarative/graphicsitems/qdeclarativemousearea_p.h b/src/declarative/graphicsitems/qdeclarativemousearea_p.h index af3e23e7..75ca8c95 100644 --- a/src/declarative/graphicsitems/qdeclarativemousearea_p.h +++ b/src/declarative/graphicsitems/qdeclarativemousearea_p.h @@ -44,8 +44,6 @@ #include "qdeclarativeitem.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -213,6 +211,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeDrag) QML_DECLARE_TYPE(QDeclarativeMouseArea) -QT_END_HEADER - #endif // QDECLARATIVEMOUSEAREA_H diff --git a/src/declarative/graphicsitems/qdeclarativepainteditem_p.h b/src/declarative/graphicsitems/qdeclarativepainteditem_p.h index 0a23b38f..fa3a3b4f 100644 --- a/src/declarative/graphicsitems/qdeclarativepainteditem_p.h +++ b/src/declarative/graphicsitems/qdeclarativepainteditem_p.h @@ -44,8 +44,6 @@ #include "qdeclarativeitem.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -113,6 +111,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativePaintedItem) -QT_END_HEADER - #endif diff --git a/src/declarative/graphicsitems/qdeclarativepath_p.h b/src/declarative/graphicsitems/qdeclarativepath_p.h index aab0da4e..429224a7 100644 --- a/src/declarative/graphicsitems/qdeclarativepath_p.h +++ b/src/declarative/graphicsitems/qdeclarativepath_p.h @@ -49,8 +49,6 @@ #include <QtCore/QObject> #include <QtGui/QPainterPath> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -281,6 +279,4 @@ QML_DECLARE_TYPE(QDeclarativePathCubic) QML_DECLARE_TYPE(QDeclarativePathPercent) QML_DECLARE_TYPE(QDeclarativePath) -QT_END_HEADER - #endif // QDECLARATIVEPATH_H diff --git a/src/declarative/graphicsitems/qdeclarativepathview_p.h b/src/declarative/graphicsitems/qdeclarativepathview_p.h index 00835d8f..6a5a8443 100644 --- a/src/declarative/graphicsitems/qdeclarativepathview_p.h +++ b/src/declarative/graphicsitems/qdeclarativepathview_p.h @@ -45,8 +45,6 @@ #include "qdeclarativeitem.h" #include "private/qdeclarativepath_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -247,6 +245,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativePathView) QML_DECLARE_TYPEINFO(QDeclarativePathView, QML_HAS_ATTACHED_PROPERTIES) -QT_END_HEADER - #endif // QDECLARATIVEPATHVIEW_H diff --git a/src/declarative/graphicsitems/qdeclarativepincharea_p.h b/src/declarative/graphicsitems/qdeclarativepincharea_p.h index c601a4ae..eff6bfc9 100644 --- a/src/declarative/graphicsitems/qdeclarativepincharea_p.h +++ b/src/declarative/graphicsitems/qdeclarativepincharea_p.h @@ -44,8 +44,6 @@ #include <qdeclarativeitem.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -308,6 +306,4 @@ QML_DECLARE_TYPE(QDeclarativePinch) QML_DECLARE_TYPE(QDeclarativePinchEvent) QML_DECLARE_TYPE(QDeclarativePinchArea) -QT_END_HEADER - #endif // QDECLARATIVEPINCHAREA_H diff --git a/src/declarative/graphicsitems/qdeclarativepositioners_p.h b/src/declarative/graphicsitems/qdeclarativepositioners_p.h index 3a78a0bb..4fe658ef 100644 --- a/src/declarative/graphicsitems/qdeclarativepositioners_p.h +++ b/src/declarative/graphicsitems/qdeclarativepositioners_p.h @@ -50,8 +50,6 @@ #include <QtCore/QObject> #include <QtCore/QString> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -228,6 +226,4 @@ QML_DECLARE_TYPE(QDeclarativeRow) QML_DECLARE_TYPE(QDeclarativeGrid) QML_DECLARE_TYPE(QDeclarativeFlow) -QT_END_HEADER - #endif diff --git a/src/declarative/graphicsitems/qdeclarativerectangle_p.h b/src/declarative/graphicsitems/qdeclarativerectangle_p.h index ccb01cfb..8d9d6e3b 100644 --- a/src/declarative/graphicsitems/qdeclarativerectangle_p.h +++ b/src/declarative/graphicsitems/qdeclarativerectangle_p.h @@ -48,8 +48,6 @@ #include <private/qtdeclarativeglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -183,6 +181,4 @@ QML_DECLARE_TYPE(QDeclarativeGradientStop) QML_DECLARE_TYPE(QDeclarativeGradient) QML_DECLARE_TYPE(QDeclarativeRectangle) -QT_END_HEADER - #endif // QDECLARATIVERECT_H diff --git a/src/declarative/graphicsitems/qdeclarativerepeater_p.h b/src/declarative/graphicsitems/qdeclarativerepeater_p.h index d8772f3e..c9b8ad2b 100644 --- a/src/declarative/graphicsitems/qdeclarativerepeater_p.h +++ b/src/declarative/graphicsitems/qdeclarativerepeater_p.h @@ -44,8 +44,6 @@ #include "qdeclarativeitem.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -105,6 +103,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeRepeater) -QT_END_HEADER - #endif // QDECLARATIVEREPEATER_H diff --git a/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h b/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h index 4a42f4ed..7e408915 100644 --- a/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h @@ -51,8 +51,6 @@ #include <private/qdeclarativepixmapcache_p.h> #include <private/qdeclarativeglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -129,6 +127,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeScaleGrid) -QT_END_HEADER - #endif // QDECLARATIVESCALEGRID_H diff --git a/src/declarative/graphicsitems/qdeclarativetext_p.h b/src/declarative/graphicsitems/qdeclarativetext_p.h index 3bd97a85..5a299ade 100644 --- a/src/declarative/graphicsitems/qdeclarativetext_p.h +++ b/src/declarative/graphicsitems/qdeclarativetext_p.h @@ -47,8 +47,6 @@ #include <private/qtdeclarativeglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -206,6 +204,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeText) -QT_END_HEADER - #endif diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p.h index 46818723..a1d5a19b 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextedit_p.h @@ -50,8 +50,6 @@ #include <QtGui/qtextcursor.h> #include <QtGui/qtextformat.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -300,6 +298,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeTextEdit) -QT_END_HEADER - #endif diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p.h index 8e782e4a..119a08d7 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextinput_p.h @@ -50,8 +50,6 @@ #ifndef QT_NO_LINEEDIT -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -297,8 +295,6 @@ QML_DECLARE_TYPE(QDoubleValidator) QML_DECLARE_TYPE(QRegExpValidator) #endif -QT_END_HEADER - #endif // QT_NO_LINEEDIT #endif // QDECLARATIVETEXTINPUT_H diff --git a/src/declarative/graphicsitems/qdeclarativetextlayout_p.h b/src/declarative/graphicsitems/qdeclarativetextlayout_p.h index 2918d39c..51436aee 100644 --- a/src/declarative/graphicsitems/qdeclarativetextlayout_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextlayout_p.h @@ -44,8 +44,6 @@ #include <QtGui/qtextlayout.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -70,6 +68,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVETEXTLAYOUT_P_H diff --git a/src/declarative/graphicsitems/qdeclarativetranslate_p.h b/src/declarative/graphicsitems/qdeclarativetranslate_p.h index 797c2623..e82e85fb 100644 --- a/src/declarative/graphicsitems/qdeclarativetranslate_p.h +++ b/src/declarative/graphicsitems/qdeclarativetranslate_p.h @@ -44,8 +44,6 @@ #include "qdeclarativeitem.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -84,6 +82,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeTranslate) -QT_END_HEADER - #endif diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h b/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h index 8bc34635..1b91360e 100644 --- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h +++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h @@ -47,8 +47,6 @@ #include <QtCore/qobject.h> #include <QtCore/qabstractitemmodel.h> -QT_BEGIN_HEADER - Q_DECLARE_METATYPE(QModelIndex) QT_BEGIN_NAMESPACE @@ -252,6 +250,4 @@ QML_DECLARE_TYPE(QDeclarativeVisualItemModel) QML_DECLARE_TYPEINFO(QDeclarativeVisualItemModel, QML_HAS_ATTACHED_PROPERTIES) QML_DECLARE_TYPE(QDeclarativeVisualDataModel) -QT_END_HEADER - #endif // QDECLARATIVEVISUALDATAMODEL_H |