diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-01-31 11:22:08 +1000 |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2012-01-31 06:33:34 +0100 |
| commit | dbf35e498db723ae9850686e462ec4f45bc7b67c (patch) | |
| tree | cf1f98717e131f26e5a6d63f6693935b2fbdb76f /examples | |
| parent | 12a5ddf456ba8549645a8cb28a8b4ed6197a14da (diff) | |
Modify QtQuick1 to build in Qt5
Change-Id: I1c5ccaef420e8f119e761f50b969127f430df7ba
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'examples')
95 files changed, 109 insertions, 136 deletions
diff --git a/examples/declarative/animation/basics/color-animation/main.cpp b/examples/declarative/animation/basics/color-animation/main.cpp index 20cb7c70..719d2035 100644 --- a/examples/declarative/animation/basics/color-animation/main.cpp +++ b/examples/declarative/animation/basics/color-animation/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/animation/basics/property-animation/main.cpp b/examples/declarative/animation/basics/property-animation/main.cpp index 50a5a783..5cc07587 100644 --- a/examples/declarative/animation/basics/property-animation/main.cpp +++ b/examples/declarative/animation/basics/property-animation/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/animation/behaviors/behavior-example/main.cpp b/examples/declarative/animation/behaviors/behavior-example/main.cpp index d60ee64e..6a9abbf5 100644 --- a/examples/declarative/animation/behaviors/behavior-example/main.cpp +++ b/examples/declarative/animation/behaviors/behavior-example/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/animation/behaviors/wigglytext/main.cpp b/examples/declarative/animation/behaviors/wigglytext/main.cpp index d60ee64e..6a9abbf5 100644 --- a/examples/declarative/animation/behaviors/wigglytext/main.cpp +++ b/examples/declarative/animation/behaviors/wigglytext/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/animation/easing/main.cpp b/examples/declarative/animation/easing/main.cpp index 5cd75e7a..4eb2411e 100644 --- a/examples/declarative/animation/easing/main.cpp +++ b/examples/declarative/animation/easing/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/animation/states/main.cpp b/examples/declarative/animation/states/main.cpp index 3728c68f..a7c37ffc 100644 --- a/examples/declarative/animation/states/main.cpp +++ b/examples/declarative/animation/states/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro index ad918c33..84044f4f 100644 --- a/examples/declarative/cppextensions/imageprovider/imageprovider.pro +++ b/examples/declarative/cppextensions/imageprovider/imageprovider.pro @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += qt plugin -QT += declarative +QT += quick1 DESTDIR = ImageProviderCore TARGET = qmlimageproviderplugin diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro b/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro index 4f321977..88636c37 100644 --- a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro +++ b/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro @@ -28,7 +28,7 @@ symbian:TARGET.CAPABILITY += NetworkServices # Add dependency to Symbian components # CONFIG += qt-components -QT += network +QT += network widgets # The .cpp file which was generated for your project. Feel free to hack it. SOURCES += main.cpp diff --git a/examples/declarative/cppextensions/plugins/plugin.cpp b/examples/declarative/cppextensions/plugins/plugin.cpp index c26e889c..b77c9fb6 100644 --- a/examples/declarative/cppextensions/plugins/plugin.cpp +++ b/examples/declarative/cppextensions/plugins/plugin.cpp @@ -38,8 +38,8 @@ ** ****************************************************************************/ -#include <QtDeclarative/QDeclarativeExtensionPlugin> -#include <QtDeclarative/qdeclarative.h> +#include <QtQuick1/QDeclarativeExtensionPlugin> +#include <QtQuick1/qdeclarative.h> #include <qdebug.h> #include <qdatetime.h> #include <qbasictimer.h> diff --git a/examples/declarative/cppextensions/plugins/plugins.pro b/examples/declarative/cppextensions/plugins/plugins.pro index e5c05e09..a29d3efe 100644 --- a/examples/declarative/cppextensions/plugins/plugins.pro +++ b/examples/declarative/cppextensions/plugins/plugins.pro @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += qt plugin -QT += declarative +QT += widgets quick1 DESTDIR = com/nokia/TimeExample TARGET = qmlqtimeexampleplugin diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro index 77c6b2a2..9054f191 100644 --- a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro +++ b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = DEPENDPATH += . INCLUDEPATH += . -QT += declarative +QT += widgets quick1 SOURCES += main.cpp RESOURCES += layoutitem.qrc diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro index e42b7ed5..e616fae1 100644 --- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro +++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro @@ -28,7 +28,7 @@ symbian:TARGET.CAPABILITY += NetworkServices # Add dependency to Symbian components # CONFIG += qt-components -QT += network +QT += network widgets # The .cpp file which was generated for your project. Feel free to hack it. SOURCES += \ diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro index 52955e8a..bec3691b 100644 --- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro +++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro @@ -29,6 +29,8 @@ symbian:TARGET.CAPABILITY += NetworkServices # Add dependency to Symbian components # CONFIG += qt-components +QT += widgets + # The .cpp file which was generated for your project. Feel free to hack it. SOURCES += \ linearlayout.cpp \ diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.cpp b/examples/declarative/cppextensions/qwidgets/qwidgets.cpp index 7781f126..d87cc7d8 100644 --- a/examples/declarative/cppextensions/qwidgets/qwidgets.cpp +++ b/examples/declarative/cppextensions/qwidgets/qwidgets.cpp @@ -38,10 +38,10 @@ ** ****************************************************************************/ -#include <QtDeclarative/QDeclarativeExtensionPlugin> -#include <QtDeclarative/qdeclarative.h> -#include <QtGui/QGraphicsProxyWidget> -#include <QtGui/QPushButton> +#include <QtQuick1/QDeclarativeExtensionPlugin> +#include <QtQuick1/qdeclarative.h> +#include <QtWidgets/QGraphicsProxyWidget> +#include <QtWidgets/QPushButton> #include <QDebug> class MyPushButton : public QGraphicsProxyWidget diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.pro b/examples/declarative/cppextensions/qwidgets/qwidgets.pro index d2721808..750c864b 100644 --- a/examples/declarative/cppextensions/qwidgets/qwidgets.pro +++ b/examples/declarative/cppextensions/qwidgets/qwidgets.pro @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += qt plugin -QT += declarative +QT += widgets quick1 DESTDIR = QWidgets TARGET = qmlqwidgetsplugin diff --git a/examples/declarative/cppextensions/referenceexamples/adding/adding.pro b/examples/declarative/cppextensions/referenceexamples/adding/adding.pro index b2acf0e4..8e22ea06 100644 --- a/examples/declarative/cppextensions/referenceexamples/adding/adding.pro +++ b/examples/declarative/cppextensions/referenceexamples/adding/adding.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = adding DEPENDPATH += . INCLUDEPATH += . -QT += declarative +QT += quick1 # Input SOURCES += main.cpp \ diff --git a/examples/declarative/cppextensions/referenceexamples/attached/attached.pro b/examples/declarative/cppextensions/referenceexamples/attached/attached.pro index 24488412..57084da8 100644 --- a/examples/declarative/cppextensions/referenceexamples/attached/attached.pro +++ b/examples/declarative/cppextensions/referenceexamples/attached/attached.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = attached DEPENDPATH += . INCLUDEPATH += . -QT += declarative +QT += quick1 # Input SOURCES += main.cpp \ diff --git a/examples/declarative/cppextensions/referenceexamples/binding/binding.pro b/examples/declarative/cppextensions/referenceexamples/binding/binding.pro index 063de622..b8ecc2cb 100644 --- a/examples/declarative/cppextensions/referenceexamples/binding/binding.pro +++ b/examples/declarative/cppextensions/referenceexamples/binding/binding.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = binding DEPENDPATH += . INCLUDEPATH += . -QT += declarative +QT += quick1 # Input SOURCES += main.cpp \ diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro b/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro index 4b63bac7..d8acfa7e 100644 --- a/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro +++ b/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = coercion DEPENDPATH += . INCLUDEPATH += . -QT += declarative +QT += quick1 # Input SOURCES += main.cpp \ diff --git a/examples/declarative/cppextensions/referenceexamples/default/default.pro b/examples/declarative/cppextensions/referenceexamples/default/default.pro index aa72c11a..63ea07c3 100644 --- a/examples/declarative/cppextensions/referenceexamples/default/default.pro +++ b/examples/declarative/cppextensions/referenceexamples/default/default.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = default DEPENDPATH += . INCLUDEPATH += . -QT += declarative +QT += quick1 # Input SOURCES += main.cpp \ diff --git a/examples/declarative/cppextensions/referenceexamples/extended/extended.pro b/examples/declarative/cppextensions/referenceexamples/extended/extended.pro index fb263fd4..0513e96b 100644 --- a/examples/declarative/cppextensions/referenceexamples/extended/extended.pro +++ b/examples/declarative/cppextensions/referenceexamples/extended/extended.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = extended DEPENDPATH += . INCLUDEPATH += . -QT += declarative +QT += widgets quick1 # Input SOURCES += main.cpp \ diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro b/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro index 93406b64..92040e8c 100644 --- a/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro +++ b/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = grouped DEPENDPATH += . INCLUDEPATH += . -QT += declarative +QT += quick1 # Input SOURCES += main.cpp \ diff --git a/examples/declarative/cppextensions/referenceexamples/methods/methods.pro b/examples/declarative/cppextensions/referenceexamples/methods/methods.pro index ae062428..35868f8d 100644 --- a/examples/declarative/cppextensions/referenceexamples/methods/methods.pro +++ b/examples/declarative/cppextensions/referenceexamples/methods/methods.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = methods DEPENDPATH += . INCLUDEPATH += . -QT += declarative +QT += quick1 # Input SOURCES += main.cpp \ diff --git a/examples/declarative/cppextensions/referenceexamples/properties/properties.pro b/examples/declarative/cppextensions/referenceexamples/properties/properties.pro index 7b7616d1..d5160bab 100644 --- a/examples/declarative/cppextensions/referenceexamples/properties/properties.pro +++ b/examples/declarative/cppextensions/referenceexamples/properties/properties.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = properties DEPENDPATH += . INCLUDEPATH += . -QT += declarative +QT += quick1 # Input SOURCES += main.cpp \ diff --git a/examples/declarative/cppextensions/referenceexamples/signal/signal.pro b/examples/declarative/cppextensions/referenceexamples/signal/signal.pro index 339cfbc9..a32ca93a 100644 --- a/examples/declarative/cppextensions/referenceexamples/signal/signal.pro +++ b/examples/declarative/cppextensions/referenceexamples/signal/signal.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = signal DEPENDPATH += . INCLUDEPATH += . -QT += declarative +QT += quick1 # Input SOURCES += main.cpp \ diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro b/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro index e95914b7..770529d5 100644 --- a/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro +++ b/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = valuesource DEPENDPATH += . INCLUDEPATH += . -QT += declarative +QT += quick1 # Input SOURCES += main.cpp \ diff --git a/examples/declarative/i18n/main.cpp b/examples/declarative/i18n/main.cpp index 1296edc6..4c83adf3 100644 --- a/examples/declarative/i18n/main.cpp +++ b/examples/declarative/i18n/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/imageelements/borderimage/main.cpp b/examples/declarative/imageelements/borderimage/main.cpp index e5d25666..9ee393f7 100644 --- a/examples/declarative/imageelements/borderimage/main.cpp +++ b/examples/declarative/imageelements/borderimage/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/imageelements/image/main.cpp b/examples/declarative/imageelements/image/main.cpp index 114662b2..352a7a1a 100644 --- a/examples/declarative/imageelements/image/main.cpp +++ b/examples/declarative/imageelements/image/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/imageelements/shadows/main.cpp b/examples/declarative/imageelements/shadows/main.cpp index f910e3d2..039e76cb 100644 --- a/examples/declarative/imageelements/shadows/main.cpp +++ b/examples/declarative/imageelements/shadows/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/keyinteraction/focus/main.cpp b/examples/declarative/keyinteraction/focus/main.cpp index 1cbe5e03..ed3e020c 100644 --- a/examples/declarative/keyinteraction/focus/main.cpp +++ b/examples/declarative/keyinteraction/focus/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro index c751b2c1..3b4d8262 100644 --- a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro +++ b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro @@ -29,6 +29,8 @@ symbian:TARGET.CAPABILITY += NetworkServices # Add dependency to Symbian components # CONFIG += qt-components +QT += widgets + # The .cpp file which was generated for your project. Feel free to hack it. SOURCES = main.cpp model.cpp HEADERS = model.h diff --git a/examples/declarative/modelviews/gridview/main.cpp b/examples/declarative/modelviews/gridview/main.cpp index a3e331b2..0c243fbd 100644 --- a/examples/declarative/modelviews/gridview/main.cpp +++ b/examples/declarative/modelviews/gridview/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/modelviews/listview/dynamiclist/main.cpp b/examples/declarative/modelviews/listview/dynamiclist/main.cpp index 1d197cba..571f54ef 100644 --- a/examples/declarative/modelviews/listview/dynamiclist/main.cpp +++ b/examples/declarative/modelviews/listview/dynamiclist/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/modelviews/listview/expandingdelegates/main.cpp b/examples/declarative/modelviews/listview/expandingdelegates/main.cpp index b9c99a03..017420bb 100644 --- a/examples/declarative/modelviews/listview/expandingdelegates/main.cpp +++ b/examples/declarative/modelviews/listview/expandingdelegates/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/modelviews/listview/highlight/main.cpp b/examples/declarative/modelviews/listview/highlight/main.cpp index 0b1fe97f..6f28c7a9 100644 --- a/examples/declarative/modelviews/listview/highlight/main.cpp +++ b/examples/declarative/modelviews/listview/highlight/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/modelviews/listview/highlightranges/main.cpp b/examples/declarative/modelviews/listview/highlightranges/main.cpp index cd4b76c9..66ab7808 100644 --- a/examples/declarative/modelviews/listview/highlightranges/main.cpp +++ b/examples/declarative/modelviews/listview/highlightranges/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/modelviews/listview/sections/main.cpp b/examples/declarative/modelviews/listview/sections/main.cpp index 8bb1edf1..960f00c8 100644 --- a/examples/declarative/modelviews/listview/sections/main.cpp +++ b/examples/declarative/modelviews/listview/sections/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro index be38339c..378d40ec 100644 --- a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro +++ b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro @@ -29,6 +29,8 @@ symbian:TARGET.CAPABILITY += NetworkServices # Add dependency to Symbian components # CONFIG += qt-components +QT += widgets + # input SOURCES += main.cpp \ dataobject.cpp diff --git a/examples/declarative/modelviews/package/main.cpp b/examples/declarative/modelviews/package/main.cpp index 2131955f..5e96a41d 100644 --- a/examples/declarative/modelviews/package/main.cpp +++ b/examples/declarative/modelviews/package/main.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ #include "qmlapplicationviewer.h" -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> Q_DECL_EXPORT int main(int argc, char *argv[]) { diff --git a/examples/declarative/modelviews/parallax/main.cpp b/examples/declarative/modelviews/parallax/main.cpp index 5f95c60d..6427bee1 100644 --- a/examples/declarative/modelviews/parallax/main.cpp +++ b/examples/declarative/modelviews/parallax/main.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ #include "qmlapplicationviewer.h" -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> Q_DECL_EXPORT int main(int argc, char *argv[]) { diff --git a/examples/declarative/modelviews/pathview/main.cpp b/examples/declarative/modelviews/pathview/main.cpp index 7b466854..7682d661 100644 --- a/examples/declarative/modelviews/pathview/main.cpp +++ b/examples/declarative/modelviews/pathview/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro b/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro index b6c7e229..685cb358 100644 --- a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro +++ b/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro @@ -29,6 +29,8 @@ symbian:TARGET.CAPABILITY += NetworkServices # Add dependency to Symbian components # CONFIG += qt-components +QT += widgets + # The .cpp file which was generated for your project. Feel free to hack it. SOURCES += main.cpp diff --git a/examples/declarative/modelviews/visualitemmodel/main.cpp b/examples/declarative/modelviews/visualitemmodel/main.cpp index 6bcb474a..26213e36 100644 --- a/examples/declarative/modelviews/visualitemmodel/main.cpp +++ b/examples/declarative/modelviews/visualitemmodel/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/modelviews/webview/alerts/main.cpp b/examples/declarative/modelviews/webview/alerts/main.cpp index f8eb727e..bf8770fe 100644 --- a/examples/declarative/modelviews/webview/alerts/main.cpp +++ b/examples/declarative/modelviews/webview/alerts/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/modelviews/webview/autosize/main.cpp b/examples/declarative/modelviews/webview/autosize/main.cpp index b5b7da3e..98c7bfd4 100644 --- a/examples/declarative/modelviews/webview/autosize/main.cpp +++ b/examples/declarative/modelviews/webview/autosize/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/modelviews/webview/googlemaps/main.cpp b/examples/declarative/modelviews/webview/googlemaps/main.cpp index cc3a3ae0..34c67e2a 100644 --- a/examples/declarative/modelviews/webview/googlemaps/main.cpp +++ b/examples/declarative/modelviews/webview/googlemaps/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/modelviews/webview/inlinehtml/main.cpp b/examples/declarative/modelviews/webview/inlinehtml/main.cpp index 35a06f32..e05231a4 100644 --- a/examples/declarative/modelviews/webview/inlinehtml/main.cpp +++ b/examples/declarative/modelviews/webview/inlinehtml/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/modelviews/webview/newwindows/main.cpp b/examples/declarative/modelviews/webview/newwindows/main.cpp index 779cbf19..70ddd1fd 100644 --- a/examples/declarative/modelviews/webview/newwindows/main.cpp +++ b/examples/declarative/modelviews/webview/newwindows/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/positioners/main.cpp b/examples/declarative/positioners/main.cpp index 474d0cbe..f8fb55cc 100644 --- a/examples/declarative/positioners/main.cpp +++ b/examples/declarative/positioners/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/righttoleft/layoutdirection/main.cpp b/examples/declarative/righttoleft/layoutdirection/main.cpp index 215a8d4d..8ca3eae7 100644 --- a/examples/declarative/righttoleft/layoutdirection/main.cpp +++ b/examples/declarative/righttoleft/layoutdirection/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" Q_DECL_EXPORT int main(int argc, char *argv[]) diff --git a/examples/declarative/righttoleft/layoutmirroring/main.cpp b/examples/declarative/righttoleft/layoutmirroring/main.cpp index 00ade6fd..c9c0b833 100644 --- a/examples/declarative/righttoleft/layoutmirroring/main.cpp +++ b/examples/declarative/righttoleft/layoutmirroring/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" Q_DECL_EXPORT int main(int argc, char *argv[]) diff --git a/examples/declarative/righttoleft/textalignment/main.cpp b/examples/declarative/righttoleft/textalignment/main.cpp index c8a86834..ec6c1e00 100644 --- a/examples/declarative/righttoleft/textalignment/main.cpp +++ b/examples/declarative/righttoleft/textalignment/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" Q_DECL_EXPORT int main(int argc, char *argv[]) diff --git a/examples/declarative/shadereffects/main.cpp b/examples/declarative/shadereffects/main.cpp index 4e70e821..31caa9f4 100644 --- a/examples/declarative/shadereffects/main.cpp +++ b/examples/declarative/shadereffects/main.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlapplicationviewer.h" -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <QtOpenGL> #include <QDeclarativeView> #include <QDeclarativeEngine> diff --git a/examples/declarative/shadereffects/shadereffects.pro b/examples/declarative/shadereffects/shadereffects.pro index 58e7ab7d..9b56e72c 100644 --- a/examples/declarative/shadereffects/shadereffects.pro +++ b/examples/declarative/shadereffects/shadereffects.pro @@ -29,7 +29,7 @@ symbian:TARGET.CAPABILITY += NetworkServices # Add dependency to Symbian components # CONFIG += qt-components -QT += declarative opengl +QT += quick1 opengl # The .cpp file which was generated for your project. Feel free to hack it. SOURCES += main.cpp diff --git a/examples/declarative/sqllocalstorage/main.cpp b/examples/declarative/sqllocalstorage/main.cpp index a4b63171..46691bf2 100644 --- a/examples/declarative/sqllocalstorage/main.cpp +++ b/examples/declarative/sqllocalstorage/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" Q_DECL_EXPORT int main(int argc, char *argv[]) diff --git a/examples/declarative/text/fonts/availableFonts/main.cpp b/examples/declarative/text/fonts/availableFonts/main.cpp index 3b26ddec..dfa42f5a 100644 --- a/examples/declarative/text/fonts/availableFonts/main.cpp +++ b/examples/declarative/text/fonts/availableFonts/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/text/fonts/banner/main.cpp b/examples/declarative/text/fonts/banner/main.cpp index c693e991..7b49331c 100644 --- a/examples/declarative/text/fonts/banner/main.cpp +++ b/examples/declarative/text/fonts/banner/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/text/fonts/fonts/main.cpp b/examples/declarative/text/fonts/fonts/main.cpp index ab7bd32d..5f962a30 100644 --- a/examples/declarative/text/fonts/fonts/main.cpp +++ b/examples/declarative/text/fonts/fonts/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/text/fonts/hello/main.cpp b/examples/declarative/text/fonts/hello/main.cpp index fb2cee60..ecf62db3 100644 --- a/examples/declarative/text/fonts/hello/main.cpp +++ b/examples/declarative/text/fonts/hello/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/text/textselection/main.cpp b/examples/declarative/text/textselection/main.cpp index 5a96999d..1798e0cd 100644 --- a/examples/declarative/text/textselection/main.cpp +++ b/examples/declarative/text/textselection/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/threading/threadedlistmodel/main.cpp b/examples/declarative/threading/threadedlistmodel/main.cpp index 1707c1ae..10997898 100644 --- a/examples/declarative/threading/threadedlistmodel/main.cpp +++ b/examples/declarative/threading/threadedlistmodel/main.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ #include "qmlapplicationviewer.h" -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> Q_DECL_EXPORT int main(int argc, char *argv[]) { diff --git a/examples/declarative/threading/workerscript/main.cpp b/examples/declarative/threading/workerscript/main.cpp index ea8b6688..0111ef73 100644 --- a/examples/declarative/threading/workerscript/main.cpp +++ b/examples/declarative/threading/workerscript/main.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ #include "qmlapplicationviewer.h" -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> Q_DECL_EXPORT int main(int argc, char *argv[]) { diff --git a/examples/declarative/touchinteraction/gestures/experimental-gestures/main.cpp b/examples/declarative/touchinteraction/gestures/experimental-gestures/main.cpp index 9a38a46c..c25744a0 100644 --- a/examples/declarative/touchinteraction/gestures/experimental-gestures/main.cpp +++ b/examples/declarative/touchinteraction/gestures/experimental-gestures/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/touchinteraction/mousearea/mousearea-example/main.cpp b/examples/declarative/touchinteraction/mousearea/mousearea-example/main.cpp index d7bb4a2f..af2ad6dc 100644 --- a/examples/declarative/touchinteraction/mousearea/mousearea-example/main.cpp +++ b/examples/declarative/touchinteraction/mousearea/mousearea-example/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/touchinteraction/pincharea/main.cpp b/examples/declarative/touchinteraction/pincharea/main.cpp index 676c6b35..5cb984e0 100644 --- a/examples/declarative/touchinteraction/pincharea/main.cpp +++ b/examples/declarative/touchinteraction/pincharea/main.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ #include "qmlapplicationviewer.h" -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> Q_DECL_EXPORT int main(int argc, char *argv[]) { diff --git a/examples/declarative/toys/clocks/main.cpp b/examples/declarative/toys/clocks/main.cpp index 1a56f891..c3df876d 100644 --- a/examples/declarative/toys/clocks/main.cpp +++ b/examples/declarative/toys/clocks/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/toys/corkboards/main.cpp b/examples/declarative/toys/corkboards/main.cpp index 0ca8f8d4..af0bdf08 100644 --- a/examples/declarative/toys/corkboards/main.cpp +++ b/examples/declarative/toys/corkboards/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/toys/dynamicscene/main.cpp b/examples/declarative/toys/dynamicscene/main.cpp index 90642197..226550e7 100644 --- a/examples/declarative/toys/dynamicscene/main.cpp +++ b/examples/declarative/toys/dynamicscene/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/toys/tic-tac-toe/main.cpp b/examples/declarative/toys/tic-tac-toe/main.cpp index fef1486b..fa4db31d 100644 --- a/examples/declarative/toys/tic-tac-toe/main.cpp +++ b/examples/declarative/toys/tic-tac-toe/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/toys/tvtennis/main.cpp b/examples/declarative/toys/tvtennis/main.cpp index 330cd175..e6ccee37 100644 --- a/examples/declarative/toys/tvtennis/main.cpp +++ b/examples/declarative/toys/tvtennis/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro b/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro index 0f041671..d75e7b26 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 += widgets quick1 HEADERS += piechart.h SOURCES += piechart.cpp \ diff --git a/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro b/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro index 0f041671..d75e7b26 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 += widgets quick1 HEADERS += piechart.h SOURCES += piechart.cpp \ diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro b/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro index 0f041671..d75e7b26 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 += widgets quick1 HEADERS += piechart.h SOURCES += piechart.cpp \ diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro index c3f5402a..535f8a72 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 += widgets quick1 HEADERS += piechart.h \ pieslice.h diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro b/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro index c3f5402a..535f8a72 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 += widgets quick1 HEADERS += piechart.h \ pieslice.h diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro b/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro index e16a1f21..2d7d9489 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 += quick1 DESTDIR = lib OBJECTS_DIR = tmp diff --git a/examples/declarative/ui-components/dialcontrol/main.cpp b/examples/declarative/ui-components/dialcontrol/main.cpp index 84c8b279..f3c9cd1c 100644 --- a/examples/declarative/ui-components/dialcontrol/main.cpp +++ b/examples/declarative/ui-components/dialcontrol/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/ui-components/flipable/main.cpp b/examples/declarative/ui-components/flipable/main.cpp index 50855dbb..466306e4 100644 --- a/examples/declarative/ui-components/flipable/main.cpp +++ b/examples/declarative/ui-components/flipable/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/ui-components/main/main.cpp b/examples/declarative/ui-components/main/main.cpp index 925abc18..9091d1da 100644 --- a/examples/declarative/ui-components/main/main.cpp +++ b/examples/declarative/ui-components/main/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/ui-components/progressbar/main.cpp b/examples/declarative/ui-components/progressbar/main.cpp index 97b20357..dddec958 100644 --- a/examples/declarative/ui-components/progressbar/main.cpp +++ b/examples/declarative/ui-components/progressbar/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/ui-components/scrollbar/main.cpp b/examples/declarative/ui-components/scrollbar/main.cpp index 00ecf445..f611a19b 100644 --- a/examples/declarative/ui-components/scrollbar/main.cpp +++ b/examples/declarative/ui-components/scrollbar/main.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ #include "qmlapplicationviewer.h" -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> Q_DECL_EXPORT int main(int argc, char *argv[]) { diff --git a/examples/declarative/ui-components/searchbox/main.cpp b/examples/declarative/ui-components/searchbox/main.cpp index 84680ca3..bce0043e 100644 --- a/examples/declarative/ui-components/searchbox/main.cpp +++ b/examples/declarative/ui-components/searchbox/main.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ #include "qmlapplicationviewer.h" -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> Q_DECL_EXPORT int main(int argc, char *argv[]) { diff --git a/examples/declarative/ui-components/slideswitch/main.cpp b/examples/declarative/ui-components/slideswitch/main.cpp index 6def7fcc..35e8f5e9 100644 --- a/examples/declarative/ui-components/slideswitch/main.cpp +++ b/examples/declarative/ui-components/slideswitch/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/declarative/ui-components/spinner/main.cpp b/examples/declarative/ui-components/spinner/main.cpp index 3758c4cf..3f45f340 100644 --- a/examples/declarative/ui-components/spinner/main.cpp +++ b/examples/declarative/ui-components/spinner/main.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ #include "qmlapplicationviewer.h" -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> Q_DECL_EXPORT int main(int argc, char *argv[]) { diff --git a/examples/declarative/ui-components/tabwidget/main.cpp b/examples/declarative/ui-components/tabwidget/main.cpp index 9e4ab923..87b5b8e0 100644 --- a/examples/declarative/ui-components/tabwidget/main.cpp +++ b/examples/declarative/ui-components/tabwidget/main.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ #include "qmlapplicationviewer.h" -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> Q_DECL_EXPORT int main(int argc, char *argv[]) { diff --git a/examples/declarative/xml/xmlhttprequest-example/main.cpp b/examples/declarative/xml/xmlhttprequest-example/main.cpp index 82e6a3bc..0c0bce51 100644 --- a/examples/declarative/xml/xmlhttprequest-example/main.cpp +++ b/examples/declarative/xml/xmlhttprequest-example/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qmlapplicationviewer.h" int main(int argc, char *argv[]) diff --git a/examples/examples.pro b/examples/examples.pro new file mode 100644 index 00000000..03c4a217 --- /dev/null +++ b/examples/examples.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS += declarative diff --git a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp index 570f68f3..d8a9336b 100644 --- a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -42,10 +42,10 @@ #include <QtCore/QDir> #include <QtCore/QFileInfo> -#include <QtDeclarative/QDeclarativeComponent> -#include <QtDeclarative/QDeclarativeEngine> -#include <QtDeclarative/QDeclarativeContext> -#include <QtGui/QApplication> +#include <QtQuick1/QDeclarativeComponent> +#include <QtQuick1/QDeclarativeEngine> +#include <QtQuick1/QDeclarativeContext> +#include <QtWidgets/QApplication> #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN @@ -164,45 +164,8 @@ void QmlApplicationViewer::addImportPath(const QString &path) void QmlApplicationViewer::setOrientation(ScreenOrientation orientation) { -#if defined(Q_OS_SYMBIAN) - // If the version of Qt on the device is < 4.7.2, that attribute won't work - if (orientation != ScreenOrientationAuto) { - const QStringList v = QString::fromAscii(qVersion()).split(QLatin1Char('.')); - if (v.count() == 3 && (v.at(0).toInt() << 16 | v.at(1).toInt() << 8 | v.at(2).toInt()) < 0x040702) { - qWarning("Screen orientation locking only supported with Qt 4.7.2 and above"); - return; - } - } -#endif // Q_OS_SYMBIAN - - Qt::WidgetAttribute attribute; - switch (orientation) { -#if QT_VERSION < 0x040702 - // Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes - case ScreenOrientationLockPortrait: - attribute = static_cast<Qt::WidgetAttribute>(128); - break; - case ScreenOrientationLockLandscape: - attribute = static_cast<Qt::WidgetAttribute>(129); - break; - default: - case ScreenOrientationAuto: - attribute = static_cast<Qt::WidgetAttribute>(130); - break; -#else // QT_VERSION < 0x040702 - case ScreenOrientationLockPortrait: - attribute = Qt::WA_LockPortraitOrientation; - break; - case ScreenOrientationLockLandscape: - attribute = Qt::WA_LockLandscapeOrientation; - break; - default: - case ScreenOrientationAuto: - attribute = Qt::WA_AutoOrientation; - break; -#endif // QT_VERSION < 0x040702 - }; - setAttribute(attribute, true); + // TODO: Needs a Qt5 implmentation + Q_UNUSED(orientation) } void QmlApplicationViewer::showExpanded() diff --git a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.h b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.h index 85c02ab6..d8ef27e0 100644 --- a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.h +++ b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.h @@ -41,7 +41,7 @@ #ifndef QMLAPPLICATIONVIEWER_H #define QMLAPPLICATIONVIEWER_H -#include <QtDeclarative/QDeclarativeView> +#include <QtQuick1/QDeclarativeView> class QmlApplicationViewer : public QDeclarativeView { diff --git a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri index 6809b644..2feb9e0d 100644 --- a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri @@ -4,7 +4,7 @@ # It is recommended not to modify this file, since newer versions of Qt Creator # may offer an updated version of it. -QT += declarative +QT += quick1 SOURCES += $$PWD/qmlapplicationviewer.cpp HEADERS += $$PWD/qmlapplicationviewer.h diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp index 7d1c7cb1..154b8b9b 100644 --- a/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp @@ -41,7 +41,7 @@ #include "dialogPlugin.h" #include "directory.h" #include "file.h" -#include <QtDeclarative/qdeclarative.h> +#include <QtQuick1/qdeclarative.h> void DialogPlugin::registerTypes(const char *uri) { diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h index 110908f8..7b62156a 100644 --- a/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h @@ -41,7 +41,7 @@ #ifndef DIALOGPLUGIN_H #define DIALOGPLUGIN_H -#include <QtDeclarative/QDeclarativeExtensionPlugin> +#include <QtQuick1/QDeclarativeExtensionPlugin> class DialogPlugin : public QDeclarativeExtensionPlugin { diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.cpp b/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.cpp index 6d438f08..90ffb1a9 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.cpp +++ b/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.cpp @@ -41,7 +41,7 @@ #include "dialogPlugin.h" #include "directory.h" #include "file.h" -#include <QtDeclarative/qdeclarative.h> +#include <QtQuick1/qdeclarative.h> void DialogPlugin::registerTypes(const char *uri){ diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.h b/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.h index da47e2a0..c8e17826 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.h +++ b/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.h @@ -41,7 +41,7 @@ #ifndef DIALOGPLUGIN_H #define DIALOGPLUGIN_H -#include <QtDeclarative/QDeclarativeExtensionPlugin> +#include <QtQuick1/QDeclarativeExtensionPlugin> class DialogPlugin : public QDeclarativeExtensionPlugin { |