diff options
Diffstat (limited to 'examples/declarative/tutorials')
20 files changed, 20 insertions, 20 deletions
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 |