diff options
Diffstat (limited to 'examples/declarative')
38 files changed, 44 insertions, 44 deletions
diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp b/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp index e8ccdb7e36..4a13b7a597 100644 --- a/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp +++ b/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp @@ -44,7 +44,7 @@ #include <QDeclarativeEngine> #include <QDeclarativeNetworkAccessManagerFactory> -#include <QQuickView> +#include <QtQuick/QQuickView> /* diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro b/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro index 74d8db321d..18d7879900 100644 --- a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro +++ b/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = networkaccessmanagerfactory DEPENDPATH += . INCLUDEPATH += . -QT += declarative network +QT += declarative quick network # Input SOURCES += main.cpp diff --git a/examples/declarative/minehunt/main.cpp b/examples/declarative/minehunt/main.cpp index 205835a9c0..5cc49af684 100644 --- a/examples/declarative/minehunt/main.cpp +++ b/examples/declarative/minehunt/main.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include <QtGui/QGuiApplication> -#include <qquickview.h> +#include <QtQuick/qquickview.h> #include <QtDeclarative/QDeclarativeContext> #include <QtDeclarative/QDeclarativeEngine> diff --git a/examples/declarative/minehunt/minehunt.pro b/examples/declarative/minehunt/minehunt.pro index cf928ce333..82dfc0d5bc 100644 --- a/examples/declarative/minehunt/minehunt.pro +++ b/examples/declarative/minehunt/minehunt.pro @@ -1,6 +1,6 @@ TEMPLATE = app TARGET = minehunt -QT += declarative +QT += declarative quick # Input HEADERS += minehunt.h diff --git a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro index 6c51eed9d2..eaf2b30c89 100644 --- a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro +++ b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro @@ -2,9 +2,9 @@ TEMPLATE = app TARGET = abstractitemmodel DEPENDPATH += . INCLUDEPATH += . -QT += declarative +QT += declarative quick HEADERS = model.h SOURCES = main.cpp \ model.cpp -RESOURCES += abstractitemmodel.qrc
\ No newline at end of file +RESOURCES += abstractitemmodel.qrc diff --git a/examples/declarative/modelviews/abstractitemmodel/main.cpp b/examples/declarative/modelviews/abstractitemmodel/main.cpp index 7924815879..d8c1abc939 100644 --- a/examples/declarative/modelviews/abstractitemmodel/main.cpp +++ b/examples/declarative/modelviews/abstractitemmodel/main.cpp @@ -43,8 +43,8 @@ #include <qdeclarativeengine.h> #include <qdeclarativecontext.h> #include <qdeclarative.h> -#include <qquickitem.h> -#include <qquickview.h> +#include <QtQuick/qquickitem.h> +#include <QtQuick/qquickview.h> //![0] int main(int argc, char ** argv) diff --git a/examples/declarative/modelviews/objectlistmodel/main.cpp b/examples/declarative/modelviews/objectlistmodel/main.cpp index 67ffb946c0..fc7252c864 100644 --- a/examples/declarative/modelviews/objectlistmodel/main.cpp +++ b/examples/declarative/modelviews/objectlistmodel/main.cpp @@ -43,8 +43,8 @@ #include <qdeclarativeengine.h> #include <qdeclarativecontext.h> #include <qdeclarative.h> -#include <qquickitem.h> -#include <qquickview.h> +#include <QtQuick/qquickitem.h> +#include <QtQuick/qquickview.h> #include "dataobject.h" diff --git a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro index 8cc293dbfa..434e6f080b 100644 --- a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro +++ b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = objectlistmodel DEPENDPATH += . INCLUDEPATH += . -QT += declarative +QT += declarative quick # Input SOURCES += main.cpp \ diff --git a/examples/declarative/modelviews/stringlistmodel/main.cpp b/examples/declarative/modelviews/stringlistmodel/main.cpp index ebd3c59307..d5ddbe8fb8 100644 --- a/examples/declarative/modelviews/stringlistmodel/main.cpp +++ b/examples/declarative/modelviews/stringlistmodel/main.cpp @@ -44,8 +44,8 @@ #include <qdeclarativeengine.h> #include <qdeclarativecontext.h> #include <qdeclarative.h> -#include <qquickitem.h> -#include <qquickview.h> +#include <QtQuick/qquickitem.h> +#include <QtQuick/qquickview.h> /* diff --git a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro b/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro index 23dc481f88..d34f7d0b56 100644 --- a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro +++ b/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = stringlistmodel DEPENDPATH += . INCLUDEPATH += . -QT += declarative +QT += declarative quick # Input SOURCES += main.cpp diff --git a/examples/declarative/openglunderqml/main.cpp b/examples/declarative/openglunderqml/main.cpp index 44984c5be3..cb65c3feac 100644 --- a/examples/declarative/openglunderqml/main.cpp +++ b/examples/declarative/openglunderqml/main.cpp @@ -41,7 +41,7 @@ #include <QGuiApplication> -#include <QQuickView> +#include <QtQuick/QQuickView> #include "squircle.h" diff --git a/examples/declarative/openglunderqml/openglunderqml.pro b/examples/declarative/openglunderqml/openglunderqml.pro index 3cd167335b..c93ac791fe 100644 --- a/examples/declarative/openglunderqml/openglunderqml.pro +++ b/examples/declarative/openglunderqml/openglunderqml.pro @@ -1,4 +1,4 @@ -QT += declarative +QT += declarative quick TEMPLATE = app DEPENDPATH += . diff --git a/examples/declarative/openglunderqml/squircle.cpp b/examples/declarative/openglunderqml/squircle.cpp index c2d4c0ac97..55c1dd092c 100644 --- a/examples/declarative/openglunderqml/squircle.cpp +++ b/examples/declarative/openglunderqml/squircle.cpp @@ -41,8 +41,8 @@ #include "squircle.h" -#include <qsgengine.h> -#include <qquickcanvas.h> +#include <QtQuick/qsgengine.h> +#include <QtQuick/qquickcanvas.h> #include <QOpenGLShaderProgram> Squircle::Squircle() diff --git a/examples/declarative/openglunderqml/squircle.h b/examples/declarative/openglunderqml/squircle.h index c92c93e2db..ab33c6a25f 100644 --- a/examples/declarative/openglunderqml/squircle.h +++ b/examples/declarative/openglunderqml/squircle.h @@ -42,7 +42,7 @@ #ifndef SQUIRCLE_H #define SQUIRCLE_H -#include <QtDeclarative/QQuickItem> +#include <QtQuick/QQuickItem> #include <QtGui/QOpenGLShaderProgram> class Squircle : public QQuickItem diff --git a/examples/declarative/painteditem/smile/main.cpp b/examples/declarative/painteditem/smile/main.cpp index dc76e71185..0f69f4c962 100644 --- a/examples/declarative/painteditem/smile/main.cpp +++ b/examples/declarative/painteditem/smile/main.cpp @@ -41,8 +41,8 @@ #include <QGuiApplication> #include <QPainter> #include <QtDeclarative/qdeclarative.h> -#include <QtDeclarative/qquickview.h> -#include <QtDeclarative/qquickpainteditem.h> +#include <QtQuick/qquickview.h> +#include <QtQuick/qquickpainteditem.h> class MyPaintItem : public QQuickPaintedItem { Q_OBJECT diff --git a/examples/declarative/painteditem/smile/smile.pro b/examples/declarative/painteditem/smile/smile.pro index 3b9e4e0f62..780d351fe6 100644 --- a/examples/declarative/painteditem/smile/smile.pro +++ b/examples/declarative/painteditem/smile/smile.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = painteditem -QT += declarative +QT += declarative quick macx: CONFIG -= app_bundle diff --git a/examples/declarative/painteditem/textballoons/textballoon.h b/examples/declarative/painteditem/textballoons/textballoon.h index 064d20bd7e..e35107c1b2 100644 --- a/examples/declarative/painteditem/textballoons/textballoon.h +++ b/examples/declarative/painteditem/textballoons/textballoon.h @@ -42,7 +42,7 @@ #ifndef TEXTBALLOON_H #define TEXTBALLOON_H -#include <QtDeclarative> +#include <QtQuick> //! [0] class TextBalloon : public QQuickPaintedItem diff --git a/examples/declarative/painteditem/textballoons/textballoons.pro b/examples/declarative/painteditem/textballoons/textballoons.pro index 3148fd20e6..453a00336d 100644 --- a/examples/declarative/painteditem/textballoons/textballoons.pro +++ b/examples/declarative/painteditem/textballoons/textballoons.pro @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += qt plugin -QT += declarative +QT += declarative quick TARGET = qmltextballoonplugin diff --git a/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro b/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro index 0f0416718c..affc57ce1f 100644 --- a/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro +++ b/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro @@ -1,4 +1,4 @@ -QT += declarative +QT += declarative quick HEADERS += piechart.h SOURCES += piechart.cpp \ diff --git a/examples/declarative/tutorials/extending/chapter1-basics/main.cpp b/examples/declarative/tutorials/extending/chapter1-basics/main.cpp index 2670871e61..c507b2c30c 100644 --- a/examples/declarative/tutorials/extending/chapter1-basics/main.cpp +++ b/examples/declarative/tutorials/extending/chapter1-basics/main.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ //![0] #include "piechart.h" -#include <QQuickView> +#include <QtQuick/QQuickView> #include <QGuiApplication> int main(int argc, char *argv[]) diff --git a/examples/declarative/tutorials/extending/chapter1-basics/piechart.h b/examples/declarative/tutorials/extending/chapter1-basics/piechart.h index d1beb71545..1bd3019f7b 100644 --- a/examples/declarative/tutorials/extending/chapter1-basics/piechart.h +++ b/examples/declarative/tutorials/extending/chapter1-basics/piechart.h @@ -41,7 +41,7 @@ #define PIECHART_H //![0] -#include <QtDeclarative/QQuickPaintedItem> +#include <QtQuick/QQuickPaintedItem> #include <QColor> class PieChart : public QQuickPaintedItem diff --git a/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro b/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro index 0f0416718c..affc57ce1f 100644 --- a/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro +++ b/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro @@ -1,4 +1,4 @@ -QT += declarative +QT += declarative quick HEADERS += piechart.h SOURCES += piechart.cpp \ diff --git a/examples/declarative/tutorials/extending/chapter2-methods/main.cpp b/examples/declarative/tutorials/extending/chapter2-methods/main.cpp index 2670871e61..c507b2c30c 100644 --- a/examples/declarative/tutorials/extending/chapter2-methods/main.cpp +++ b/examples/declarative/tutorials/extending/chapter2-methods/main.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ //![0] #include "piechart.h" -#include <QQuickView> +#include <QtQuick/QQuickView> #include <QGuiApplication> int main(int argc, char *argv[]) diff --git a/examples/declarative/tutorials/extending/chapter2-methods/piechart.h b/examples/declarative/tutorials/extending/chapter2-methods/piechart.h index 5205151a0a..4ed9e0665c 100644 --- a/examples/declarative/tutorials/extending/chapter2-methods/piechart.h +++ b/examples/declarative/tutorials/extending/chapter2-methods/piechart.h @@ -40,7 +40,7 @@ #ifndef PIECHART_H #define PIECHART_H -#include <QtDeclarative/QQuickPaintedItem> +#include <QtQuick/QQuickPaintedItem> #include <QColor> //![0] diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro b/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro index 0f0416718c..affc57ce1f 100644 --- a/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro +++ b/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro @@ -1,4 +1,4 @@ -QT += declarative +QT += declarative quick HEADERS += piechart.h SOURCES += piechart.cpp \ diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/main.cpp b/examples/declarative/tutorials/extending/chapter3-bindings/main.cpp index 2670871e61..c507b2c30c 100644 --- a/examples/declarative/tutorials/extending/chapter3-bindings/main.cpp +++ b/examples/declarative/tutorials/extending/chapter3-bindings/main.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ //![0] #include "piechart.h" -#include <QQuickView> +#include <QtQuick/QQuickView> #include <QGuiApplication> int main(int argc, char *argv[]) diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/piechart.h b/examples/declarative/tutorials/extending/chapter3-bindings/piechart.h index 55be2a493f..7c5fda2744 100644 --- a/examples/declarative/tutorials/extending/chapter3-bindings/piechart.h +++ b/examples/declarative/tutorials/extending/chapter3-bindings/piechart.h @@ -41,7 +41,7 @@ #define PIECHART_H #include <QColor> -#include <QtDeclarative/QQuickPaintedItem> +#include <QtQuick/QQuickPaintedItem> //![0] class PieChart : public QQuickPaintedItem diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro index c3f5402aea..6724fa0375 100644 --- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro +++ b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro @@ -1,4 +1,4 @@ -QT += declarative +QT += declarative quick HEADERS += piechart.h \ pieslice.h diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp index c9b9a0b5aa..5d1c4d6839 100644 --- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp +++ b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp @@ -40,7 +40,7 @@ #include "piechart.h" #include "pieslice.h" -#include <QQuickView> +#include <QtQuick/QQuickView> #include <QGuiApplication> //![0] diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.h b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.h index c1cdf30805..36a866dfc3 100644 --- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.h +++ b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.h @@ -40,7 +40,7 @@ #ifndef PIECHART_H #define PIECHART_H -#include <QtDeclarative/QQuickItem> +#include <QtQuick/QQuickItem> class PieSlice; diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.h b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.h index 59606486a4..23913adf84 100644 --- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.h +++ b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.h @@ -40,7 +40,7 @@ #ifndef PIESLICE_H #define PIESLICE_H -#include <QtDeclarative/QQuickPaintedItem> +#include <QtQuick/QQuickPaintedItem> #include <QColor> //![0] diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro b/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro index c3f5402aea..6724fa0375 100644 --- a/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro +++ b/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro @@ -1,4 +1,4 @@ -QT += declarative +QT += declarative quick HEADERS += piechart.h \ pieslice.h diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp b/examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp index 78f6f25485..afd34455c8 100644 --- a/examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp +++ b/examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp @@ -40,7 +40,7 @@ #include "piechart.h" #include "pieslice.h" -#include <QQuickView> +#include <QtQuick/QQuickView> #include <QGuiApplication> int main(int argc, char *argv[]) diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.h b/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.h index feea3d2789..5ba6b10b7a 100644 --- a/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.h +++ b/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.h @@ -40,7 +40,7 @@ #ifndef PIECHART_H #define PIECHART_H -#include <QQuickItem> +#include <QtQuick/QQuickItem> class PieSlice; diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.h b/examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.h index 157e9cda77..a9174fbe0c 100644 --- a/examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.h +++ b/examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.h @@ -40,7 +40,7 @@ #ifndef PIESLICE_H #define PIESLICE_H -#include <QtDeclarative/QQuickPaintedItem> +#include <QtQuick/QQuickPaintedItem> #include <QColor> //![0] diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro b/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro index 47fe0a2fde..c243ec4572 100644 --- a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro +++ b/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += qt plugin -QT += declarative +QT += declarative quick DESTDIR = ChartsPlugin TARGET = chartsplugin diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/piechart.h b/examples/declarative/tutorials/extending/chapter6-plugins/piechart.h index 2d58360245..927dc25e5c 100644 --- a/examples/declarative/tutorials/extending/chapter6-plugins/piechart.h +++ b/examples/declarative/tutorials/extending/chapter6-plugins/piechart.h @@ -40,7 +40,7 @@ #ifndef PIECHART_H #define PIECHART_H -#include <QQuickItem> +#include <QtQuick/QQuickItem> class PieSlice; diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/pieslice.h b/examples/declarative/tutorials/extending/chapter6-plugins/pieslice.h index 4251e49396..c09b37d1c8 100644 --- a/examples/declarative/tutorials/extending/chapter6-plugins/pieslice.h +++ b/examples/declarative/tutorials/extending/chapter6-plugins/pieslice.h @@ -40,7 +40,7 @@ #ifndef PIESLICE_H #define PIESLICE_H -#include <QtDeclarative/QQuickPaintedItem> +#include <QtQuick/QQuickPaintedItem> #include <QColor> class PieSlice : public QQuickPaintedItem |