diff options
| author | Alex Wilson <alex.wilson@nokia.com> | 2012-01-12 16:16:11 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-13 02:31:21 +0100 |
| commit | 94e991e335706374003ce0a1596a0ec9ca7f47e7 (patch) | |
| tree | 4be3498b0b19be75f9d87f333bb62f2e04c0d169 /examples | |
| parent | 62a9c03e1bd88419b59f65de997f24fb6a78fb4e (diff) | |
| download | qtlocation-94e991e335706374003ce0a1596a0ec9ca7f47e7.tar.gz | |
Explicit includes of QDeclarativeParserStatus, QtQuick fixups
* Added #include for QDeclarativeParserStatus where it's used
to avoid assuming any other header includes it for us
* Removed double QT+=declarative in location.pro
* Fixed up weatherinfo assuming that QtDeclarative == QtQuick
Change-Id: I69f944c7056b98a4c85297346f7dc5042c5ca0ee
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/weatherinfo/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/weatherinfo/main.cpp b/examples/weatherinfo/main.cpp index 07b469f9..ed002885 100644 --- a/examples/weatherinfo/main.cpp +++ b/examples/weatherinfo/main.cpp @@ -39,10 +39,10 @@ ****************************************************************************/ #include <QtGui/QGuiApplication> -#include <QtDeclarative/QQuickView> +#include <QtQuick/QQuickView> #include <QtDeclarative/QDeclarativeEngine> #include <QtDeclarative/QDeclarativeContext> -#include <QtDeclarative/QQuickItem> +#include <QtQuick/QQuickItem> //! [0] #include "appmodel.h" |