diff options
Diffstat (limited to 'src/declarative/util')
32 files changed, 52 insertions, 52 deletions
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp index 8352937..d78f0a1 100644 --- a/src/declarative/util/qmlanimation.cpp +++ b/src/declarative/util/qmlanimation.cpp @@ -54,7 +54,7 @@ #include <QtCore/qrect.h> #include <QtCore/qpoint.h> #include <QtCore/qsize.h> -#include <QtDeclarative/qmlexpression.h> +#include <qmlexpression.h> #include <private/qmlstateoperations_p.h> #include <private/qmlstringconverters_p.h> #include <private/qvariantanimation_p.h> diff --git a/src/declarative/util/qmlanimation_p.h b/src/declarative/util/qmlanimation_p.h index e7cff07..f126dee 100644 --- a/src/declarative/util/qmlanimation_p.h +++ b/src/declarative/util/qmlanimation_p.h @@ -46,10 +46,10 @@ #include <QtCore/QAbstractAnimation> #include <QtGui/qcolor.h> #include <private/qmltransition_p.h> -#include <QtDeclarative/qmlpropertyvaluesource.h> +#include <qmlpropertyvaluesource.h> #include <private/qmlstate_p.h> -#include <QtDeclarative/qml.h> -#include <QtDeclarative/qmlscriptstring.h> +#include <qml.h> +#include <qmlscriptstring.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlanimation_p_p.h b/src/declarative/util/qmlanimation_p_p.h index b90f7e8..e50415f 100644 --- a/src/declarative/util/qmlanimation_p_p.h +++ b/src/declarative/util/qmlanimation_p_p.h @@ -61,8 +61,8 @@ #include <QtCore/QAnimationGroup> #include <QtGui/QColor> #include <private/qmlanimation_p.h> -#include <QtDeclarative/qml.h> -#include <QtDeclarative/qmlcontext.h> +#include <qml.h> +#include <qmlcontext.h> #include <private/qmltimeline_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlbehavior.cpp b/src/declarative/util/qmlbehavior.cpp index 8364d8c..711c70d 100644 --- a/src/declarative/util/qmlbehavior.cpp +++ b/src/declarative/util/qmlbehavior.cpp @@ -43,8 +43,8 @@ #include <private/qmlanimation_p.h> #include <private/qmltransition_p.h> #include "qmlbehavior_p.h" -#include <QtDeclarative/qmlcontext.h> -#include <QtDeclarative/qmlinfo.h> +#include <qmlcontext.h> +#include <qmlinfo.h> #include <QtCore/qparallelanimationgroup.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlbehavior_p.h b/src/declarative/util/qmlbehavior_p.h index 9f85f84..b61df32 100644 --- a/src/declarative/util/qmlbehavior_p.h +++ b/src/declarative/util/qmlbehavior_p.h @@ -42,9 +42,9 @@ #ifndef QMLBEHAVIOR_H #define QMLBEHAVIOR_H -#include <QtDeclarative/qmlpropertyvaluesource.h> -#include <QtDeclarative/qmlpropertyvalueinterceptor.h> -#include <QtDeclarative/qml.h> +#include <qmlpropertyvaluesource.h> +#include <qmlpropertyvalueinterceptor.h> +#include <qml.h> #include <private/qmlstate_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlbind.cpp b/src/declarative/util/qmlbind.cpp index 86c1b8b..b8ab53e 100644 --- a/src/declarative/util/qmlbind.cpp +++ b/src/declarative/util/qmlbind.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include <QtDeclarative/qmlengine.h> -#include <QtDeclarative/qmlcontext.h> +#include <qmlengine.h> +#include <qmlcontext.h> #include <private/qobject_p.h> #include <QtCore/qfile.h> #include <QtCore/qdebug.h> diff --git a/src/declarative/util/qmlbind_p.h b/src/declarative/util/qmlbind_p.h index c3118a3..a9b7b98 100644 --- a/src/declarative/util/qmlbind_p.h +++ b/src/declarative/util/qmlbind_p.h @@ -43,7 +43,7 @@ #define QMLBIND_H #include <QtCore/qobject.h> -#include <QtDeclarative/qml.h> +#include <qml.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlconnection.cpp b/src/declarative/util/qmlconnection.cpp index db744f6..b1771d4 100644 --- a/src/declarative/util/qmlconnection.cpp +++ b/src/declarative/util/qmlconnection.cpp @@ -40,10 +40,10 @@ ****************************************************************************/ #include "qmlconnection_p.h" -#include <QtDeclarative/qmlexpression.h> +#include <qmlexpression.h> #include "private/qmlboundsignal_p.h" #include "private/qobject_p.h" -#include <QtDeclarative/qmlcontext.h> +#include <qmlcontext.h> #include <QtCore/qdebug.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlconnection_p.h b/src/declarative/util/qmlconnection_p.h index 7a69771..1bc81fe 100644 --- a/src/declarative/util/qmlconnection_p.h +++ b/src/declarative/util/qmlconnection_p.h @@ -44,8 +44,8 @@ #include <QtCore/qobject.h> #include <QtCore/qstring.h> -#include <QtDeclarative/qml.h> -#include <QtDeclarative/qmlscriptstring.h> +#include <qml.h> +#include <qmlscriptstring.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmldatetimeformatter_p.h b/src/declarative/util/qmldatetimeformatter_p.h index e350f96..cd5f75f 100644 --- a/src/declarative/util/qmldatetimeformatter_p.h +++ b/src/declarative/util/qmldatetimeformatter_p.h @@ -43,7 +43,7 @@ #define QMLDATETIMEFORMATTER_H #include <QtCore/qdatetime.h> -#include <QtDeclarative/qml.h> +#include <qml.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmleasefollow.cpp b/src/declarative/util/qmleasefollow.cpp index 6bf3f82..b326f63 100644 --- a/src/declarative/util/qmleasefollow.cpp +++ b/src/declarative/util/qmleasefollow.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmleasefollow_p.h" -#include <QtDeclarative/qmlmetaproperty.h> +#include <qmlmetaproperty.h> #include <math.h> #include <QtCore/qdebug.h> #include <private/qmlanimation_p_p.h> diff --git a/src/declarative/util/qmleasefollow_p.h b/src/declarative/util/qmleasefollow_p.h index 3de72f2..8ea2b8f 100644 --- a/src/declarative/util/qmleasefollow_p.h +++ b/src/declarative/util/qmleasefollow_p.h @@ -43,8 +43,8 @@ #define QMLEASEFOLLOW_H #include <QtCore/qobject.h> -#include <QtDeclarative/qml.h> -#include <QtDeclarative/qmlpropertyvaluesource.h> +#include <qml.h> +#include <qmlpropertyvaluesource.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlfontloader.cpp b/src/declarative/util/qmlfontloader.cpp index 36ee1bb..bb26536 100644 --- a/src/declarative/util/qmlfontloader.cpp +++ b/src/declarative/util/qmlfontloader.cpp @@ -47,7 +47,7 @@ #include <QNetworkReply> #include <QFile> #include <QmlContext> -#include <QtDeclarative/qmlengine.h> +#include <qmlengine.h> #include <QFontDatabase> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlfontloader_p.h b/src/declarative/util/qmlfontloader_p.h index d02a181..0202f3c 100644 --- a/src/declarative/util/qmlfontloader_p.h +++ b/src/declarative/util/qmlfontloader_p.h @@ -43,7 +43,7 @@ #define QMLFONTLOADER_H #include <QtCore/qobject.h> -#include <QtDeclarative/qml.h> +#include <qml.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmllistmodel_p.h b/src/declarative/util/qmllistmodel_p.h index 34b1562..d626060 100644 --- a/src/declarative/util/qmllistmodel_p.h +++ b/src/declarative/util/qmllistmodel_p.h @@ -47,7 +47,7 @@ #include <QtCore/QHash> #include <QtCore/QList> #include <QtCore/QVariant> -#include <QtDeclarative/qml.h> +#include <qml.h> #include <private/qlistmodelinterface_p.h> #include <QtScript/qscriptvalue.h> diff --git a/src/declarative/util/qmlnumberformatter_p.h b/src/declarative/util/qmlnumberformatter_p.h index 0036cb9..346c2f0 100644 --- a/src/declarative/util/qmlnumberformatter_p.h +++ b/src/declarative/util/qmlnumberformatter_p.h @@ -42,7 +42,7 @@ #ifndef QMLNUMBERFORMATTER_H #define QMLNUMBERFORMATTER_H -#include <QtDeclarative/qml.h> +#include <qml.h> #include <private/qnumberformat_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlpackage_p.h b/src/declarative/util/qmlpackage_p.h index abb57c6..ff42aad 100644 --- a/src/declarative/util/qmlpackage_p.h +++ b/src/declarative/util/qmlpackage_p.h @@ -42,7 +42,7 @@ #ifndef QMLPACKAGE_H #define QMLPACKAGE_H -#include <QtDeclarative/qml.h> +#include <qml.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlpixmapcache.cpp b/src/declarative/util/qmlpixmapcache.cpp index f5904c0..ba7895a 100644 --- a/src/declarative/util/qmlpixmapcache.cpp +++ b/src/declarative/util/qmlpixmapcache.cpp @@ -45,7 +45,7 @@ #include <QNetworkReply> #include <QPixmapCache> #include <private/qfxperf_p_p.h> -#include <QtDeclarative/qmlengine.h> +#include <qmlengine.h> #include <QFile> #include <QtCore/qdebug.h> diff --git a/src/declarative/util/qmlpropertychanges.cpp b/src/declarative/util/qmlpropertychanges.cpp index a18db46..a1e92b5 100644 --- a/src/declarative/util/qmlpropertychanges.cpp +++ b/src/declarative/util/qmlpropertychanges.cpp @@ -43,12 +43,12 @@ #include "qmlopenmetaobject_p.h" #include "qmlpropertychanges_p.h" #include <QtCore/qdebug.h> -#include <QtDeclarative/qmlinfo.h> +#include <qmlinfo.h> #include <private/qmlcustomparser_p.h> #include <private/qmlparser_p.h> -#include <QtDeclarative/qmlexpression.h> -#include <QtDeclarative/qmlbinding.h> -#include <QtDeclarative/qmlcontext.h> +#include <qmlexpression.h> +#include <qmlbinding.h> +#include <qmlcontext.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlspringfollow_p.h b/src/declarative/util/qmlspringfollow_p.h index b7989e4..7731b9e 100644 --- a/src/declarative/util/qmlspringfollow_p.h +++ b/src/declarative/util/qmlspringfollow_p.h @@ -42,8 +42,8 @@ #ifndef QMLSMOOTHFOLLOW_H #define QMLSMOOTHFOLLOW_H -#include <QtDeclarative/qmlpropertyvaluesource.h> -#include <QtDeclarative/qml.h> +#include <qmlpropertyvaluesource.h> +#include <qml.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlstate_p.h b/src/declarative/util/qmlstate_p.h index ff42893..50c5401 100644 --- a/src/declarative/util/qmlstate_p.h +++ b/src/declarative/util/qmlstate_p.h @@ -44,7 +44,7 @@ #include <QtCore/qobject.h> #include <QtCore/QSequentialAnimationGroup> -#include <QtDeclarative/qml.h> +#include <qml.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlstategroup.cpp b/src/declarative/util/qmlstategroup.cpp index 3cfc84a..2d3ca4c 100644 --- a/src/declarative/util/qmlstategroup.cpp +++ b/src/declarative/util/qmlstategroup.cpp @@ -42,7 +42,7 @@ #include "private/qobject_p.h" #include "qmlstategroup_p.h" #include "qmltransition_p.h" -#include <QtDeclarative/qmlbinding.h> +#include <qmlbinding.h> #include <QtCore/qdebug.h> #include <private/qmlglobal_p.h> diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp index d1aa748..2d32fdb 100644 --- a/src/declarative/util/qmlstateoperations.cpp +++ b/src/declarative/util/qmlstateoperations.cpp @@ -41,11 +41,11 @@ #include <private/qobject_p.h> #include <qml.h> -#include <QtDeclarative/qmlcontext.h> -#include <QtDeclarative/qmlexpression.h> +#include <qmlcontext.h> +#include <qmlexpression.h> #include "qmlstateoperations_p.h" #include <QtCore/qdebug.h> -#include <QtDeclarative/qmlinfo.h> +#include <qmlinfo.h> #include <private/qmlgraphicsanchors_p_p.h> #include <private/qmlgraphicsitem_p.h> #include <QtGui/qgraphicsitem.h> diff --git a/src/declarative/util/qmlstateoperations_p.h b/src/declarative/util/qmlstateoperations_p.h index 861e4d0..a9488dc 100644 --- a/src/declarative/util/qmlstateoperations_p.h +++ b/src/declarative/util/qmlstateoperations_p.h @@ -43,9 +43,9 @@ #define QMLSTATEOPERATIONS_H #include <private/qmlstate_p.h> -#include <QtDeclarative/qmlgraphicsitem.h> +#include <qmlgraphicsitem.h> #include <private/qmlgraphicsanchors_p.h> -#include <QtDeclarative/qmlscriptstring.h> +#include <qmlscriptstring.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlsystempalette_p.h b/src/declarative/util/qmlsystempalette_p.h index 6abbfe0..8ee511a 100644 --- a/src/declarative/util/qmlsystempalette_p.h +++ b/src/declarative/util/qmlsystempalette_p.h @@ -43,7 +43,7 @@ #define QMLSYSTEMPALETTE_H #include <QtCore/qobject.h> -#include <QtDeclarative/qml.h> +#include <qml.h> #include <QPalette> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmltimer_p.h b/src/declarative/util/qmltimer_p.h index f3037e0..bd96d4a 100644 --- a/src/declarative/util/qmltimer_p.h +++ b/src/declarative/util/qmltimer_p.h @@ -44,7 +44,7 @@ #include <QtCore/qobject.h> #include <QtCore/qabstractanimation.h> -#include <QtDeclarative/qml.h> +#include <qml.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmltransition_p.h b/src/declarative/util/qmltransition_p.h index a7c709f..1891a6e 100644 --- a/src/declarative/util/qmltransition_p.h +++ b/src/declarative/util/qmltransition_p.h @@ -44,7 +44,7 @@ #include <QtCore/qobject.h> #include <private/qmlstate_p.h> -#include <QtDeclarative/qml.h> +#include <qml.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmltransitionmanager.cpp b/src/declarative/util/qmltransitionmanager.cpp index 2cfc6ee..bae7e81 100644 --- a/src/declarative/util/qmltransitionmanager.cpp +++ b/src/declarative/util/qmltransitionmanager.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtDeclarative/qmlbinding.h> +#include <qmlbinding.h> #include <private/qmltransitionmanager_p_p.h> #include <private/qmlstate_p_p.h> diff --git a/src/declarative/util/qmlview.cpp b/src/declarative/util/qmlview.cpp index 0a2cc75..f294d65 100644 --- a/src/declarative/util/qmlview.cpp +++ b/src/declarative/util/qmlview.cpp @@ -57,8 +57,8 @@ #include "private/qfxperf_p_p.h" #include "qmlview.h" -#include <QtDeclarative/qmlengine.h> -#include <QtDeclarative/qmlcontext.h> +#include <qmlengine.h> +#include <qmlcontext.h> #include <private/qmldebug_p.h> #include <private/qmldebugservice_p.h> #include <QtCore/qabstractanimation.h> diff --git a/src/declarative/util/qmlxmllistmodel.cpp b/src/declarative/util/qmlxmllistmodel.cpp index 3d90b44..43be9b9 100644 --- a/src/declarative/util/qmlxmllistmodel.cpp +++ b/src/declarative/util/qmlxmllistmodel.cpp @@ -42,8 +42,8 @@ #include "qmlxmllistmodel_p.h" #include "private/qobject_p.h" -#include <QtDeclarative/qmlcontext.h> -#include <QtDeclarative/qmlengine.h> +#include <qmlcontext.h> +#include <qmlengine.h> #include <QDebug> #include <QApplication> #include <QThread> diff --git a/src/declarative/util/qmlxmllistmodel_p.h b/src/declarative/util/qmlxmllistmodel_p.h index 18bf9d2..2fa1be8 100644 --- a/src/declarative/util/qmlxmllistmodel_p.h +++ b/src/declarative/util/qmlxmllistmodel_p.h @@ -42,9 +42,9 @@ #ifndef QMLXMLLISTMODEL_H #define QMLXMLLISTMODEL_H -#include <QtDeclarative/qml.h> +#include <qml.h> #include <private/qlistmodelinterface_p.h> -#include <QtDeclarative/qmlinfo.h> +#include <qmlinfo.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qnumberformat_p.h b/src/declarative/util/qnumberformat_p.h index 1a7b8e4..be3dfce 100644 --- a/src/declarative/util/qnumberformat_p.h +++ b/src/declarative/util/qnumberformat_p.h @@ -42,7 +42,7 @@ #ifndef NUMBERFORMAT_H #define NUMBERFORMAT_H -#include <QtDeclarative/qml.h> +#include <qml.h> #include <QtCore/QLocale> #include <QtCore/QTime> |