Fixing qml build for latest Qt5

There is no quick1 module anymore. It is (again) called a declarative module.

30 files changed, 47 insertions, 186 deletions

diff --git a/demos/qmlaxes/main.cpp b/demos/qmlaxes/main.cpp
index 9a82fec7..dd13fa81 100644
--- a/demos/qmlaxes/main.cpp
+++ b/demos/qmlaxes/main.cpp
@@ -19,11 +19,7 @@
 ****************************************************************************/
 
 #include <QApplication>
-#ifdef QT5_QUICK_1
-    #include <QtQuick1/QDeclarativeEngine>
-#else
-    #include <QtDeclarative/QDeclarativeEngine>
-#endif
+#include <QtDeclarative/QDeclarativeEngine>
 #include "qmlapplicationviewer.h"
 
 Q_DECL_EXPORT int main(int argc, char *argv[])
diff --git a/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.cpp
index 05ba5a39..efbf1e37 100644
--- a/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -12,15 +12,9 @@
 
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
-#ifdef QT5_QUICK_1
-    #include <QtQuick1/QDeclarativeComponent>
-    #include <QtQuick1/QDeclarativeEngine>
-    #include <QtQuick1/QDeclarativeContext>
-#else
-    #include <QtDeclarative/QDeclarativeComponent>
-    #include <QtDeclarative/QDeclarativeEngine>
-    #include <QtDeclarative/QDeclarativeContext>
-#endif
+#include <QtDeclarative/QDeclarativeComponent>
+#include <QtDeclarative/QDeclarativeEngine>
+#include <QtDeclarative/QDeclarativeContext>
 #include <QApplication>
 
 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
diff --git a/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.h b/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.h
index 7f856586..9d0fea29 100644
--- a/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.h
+++ b/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.h
@@ -11,11 +11,7 @@
 #ifndef QMLAPPLICATIONVIEWER_H
 #define QMLAPPLICATIONVIEWER_H
 
-#ifdef QT5_QUICK_1
-    #include <QtQuick1/QDeclarativeView>
-#else
-    #include <QtDeclarative/QDeclarativeView>
-#endif
+#include <QtDeclarative/QDeclarativeView>
 
 class QmlApplicationViewer : public QDeclarativeView
 {
diff --git a/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.pri
index 830526b7..567c6dc6 100644
--- a/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.pri
+++ b/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.pri
@@ -1,8 +1,4 @@
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += quick1
-} else {
-    QT += declarative
-}
+QT += declarative
 
 SOURCES += $$PWD/qmlapplicationviewer.cpp
 HEADERS += $$PWD/qmlapplicationviewer.h
diff --git a/demos/qmlchart/main.cpp b/demos/qmlchart/main.cpp
index 582d9a38..ed856ed3 100644
--- a/demos/qmlchart/main.cpp
+++ b/demos/qmlchart/main.cpp
@@ -19,11 +19,7 @@
 ****************************************************************************/
 
 #include <QApplication>
-#ifdef QT5_QUICK_1
-    #include <QtQuick1/QDeclarativeEngine>
-#else
-    #include <QtDeclarative/QDeclarativeEngine>
-#endif
+#include <QtDeclarative/QDeclarativeEngine>
 #include "qmlapplicationviewer.h"
 
 Q_DECL_EXPORT int main(int argc, char *argv[])
diff --git a/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp
index 05ba5a39..efbf1e37 100644
--- a/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -12,15 +12,9 @@
 
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
-#ifdef QT5_QUICK_1
-    #include <QtQuick1/QDeclarativeComponent>
-    #include <QtQuick1/QDeclarativeEngine>
-    #include <QtQuick1/QDeclarativeContext>
-#else
-    #include <QtDeclarative/QDeclarativeComponent>
-    #include <QtDeclarative/QDeclarativeEngine>
-    #include <QtDeclarative/QDeclarativeContext>
-#endif
+#include <QtDeclarative/QDeclarativeComponent>
+#include <QtDeclarative/QDeclarativeEngine>
+#include <QtDeclarative/QDeclarativeContext>
 #include <QApplication>
 
 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
diff --git a/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.h b/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.h
index 7f856586..9d0fea29 100644
--- a/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.h
+++ b/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.h
@@ -11,11 +11,7 @@
 #ifndef QMLAPPLICATIONVIEWER_H
 #define QMLAPPLICATIONVIEWER_H
 
-#ifdef QT5_QUICK_1
-    #include <QtQuick1/QDeclarativeView>
-#else
-    #include <QtDeclarative/QDeclarativeView>
-#endif
+#include <QtDeclarative/QDeclarativeView>
 
 class QmlApplicationViewer : public QDeclarativeView
 {
diff --git a/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri
index 830526b7..567c6dc6 100644
--- a/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri
+++ b/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri
@@ -1,8 +1,4 @@
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += quick1
-} else {
-    QT += declarative
-}
+QT += declarative
 
 SOURCES += $$PWD/qmlapplicationviewer.cpp
 HEADERS += $$PWD/qmlapplicationviewer.h
diff --git a/demos/qmlcustomizations/main.cpp b/demos/qmlcustomizations/main.cpp
index 50fb77eb..a7538485 100644
--- a/demos/qmlcustomizations/main.cpp
+++ b/demos/qmlcustomizations/main.cpp
@@ -19,11 +19,7 @@
 ****************************************************************************/
 
 #include <QApplication>
-#ifdef QT5_QUICK_1
-    #include <QtQuick1/QDeclarativeEngine>
-#else
-    #include <QtDeclarative/QDeclarativeEngine>
-#endif
+#include <QtDeclarative/QDeclarativeEngine>
 #include "qmlapplicationviewer.h"
 
 Q_DECL_EXPORT int main(int argc, char *argv[])
diff --git a/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.cpp
index 05ba5a39..efbf1e37 100644
--- a/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -12,15 +12,9 @@
 
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
-#ifdef QT5_QUICK_1
-    #include <QtQuick1/QDeclarativeComponent>
-    #include <QtQuick1/QDeclarativeEngine>
-    #include <QtQuick1/QDeclarativeContext>
-#else
-    #include <QtDeclarative/QDeclarativeComponent>
-    #include <QtDeclarative/QDeclarativeEngine>
-    #include <QtDeclarative/QDeclarativeContext>
-#endif
+#include <QtDeclarative/QDeclarativeComponent>
+#include <QtDeclarative/QDeclarativeEngine>
+#include <QtDeclarative/QDeclarativeContext>
 #include <QApplication>
 
 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
diff --git a/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.h b/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.h
index 7f856586..9d0fea29 100644
--- a/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.h
+++ b/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.h
@@ -11,11 +11,7 @@
 #ifndef QMLAPPLICATIONVIEWER_H
 #define QMLAPPLICATIONVIEWER_H
 
-#ifdef QT5_QUICK_1
-    #include <QtQuick1/QDeclarativeView>
-#else
-    #include <QtDeclarative/QDeclarativeView>
-#endif
+#include <QtDeclarative/QDeclarativeView>
 
 class QmlApplicationViewer : public QDeclarativeView
 {
diff --git a/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.pri
index 830526b7..567c6dc6 100644
--- a/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.pri
+++ b/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.pri
@@ -1,8 +1,4 @@
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += quick1
-} else {
-    QT += declarative
-}
+QT += declarative
 
 SOURCES += $$PWD/qmlapplicationviewer.cpp
 HEADERS += $$PWD/qmlapplicationviewer.h
diff --git a/demos/qmlcustomlegend/main.cpp b/demos/qmlcustomlegend/main.cpp
index 2bb44eec..562c6764 100644
--- a/demos/qmlcustomlegend/main.cpp
+++ b/demos/qmlcustomlegend/main.cpp
@@ -19,11 +19,7 @@
 ****************************************************************************/
 
 #include <QApplication>
-#ifdef QT5_QUICK_1
-    #include <QtQuick1/QDeclarativeEngine>

-#else
-    #include <QtDeclarative/QDeclarativeEngine>

-#endif
+#include <QtDeclarative/QDeclarativeEngine>
 #include "qmlapplicationviewer.h"
 
 Q_DECL_EXPORT int main(int argc, char *argv[])
diff --git a/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.cpp
index 08d207ca..2e99f533 100644
--- a/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -12,15 +12,9 @@
 

 #include <QtCore/QDir>

 #include <QtCore/QFileInfo>

-#ifdef QT5_QUICK_1

-    #include <QtQuick1/QDeclarativeComponent>

-    #include <QtQuick1/QDeclarativeEngine>

-    #include <QtQuick1/QDeclarativeContext>

-#else

-    #include <QtDeclarative/QDeclarativeComponent>

-    #include <QtDeclarative/QDeclarativeEngine>

-    #include <QtDeclarative/QDeclarativeContext>

-#endif

+#include <QtDeclarative/QDeclarativeComponent>

+#include <QtDeclarative/QDeclarativeEngine>

+#include <QtDeclarative/QDeclarativeContext>

 #include <QApplication>

 

 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN

diff --git a/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.h b/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.h
index 22c35a1d..9d7d7766 100644
--- a/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.h
+++ b/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.h
@@ -11,11 +11,7 @@
 #ifndef QMLAPPLICATIONVIEWER_H

 #define QMLAPPLICATIONVIEWER_H

 

-#ifdef QT5_QUICK_1

-    #include <QtQuick1/QDeclarativeView>

-#else

-    #include <QtDeclarative/QDeclarativeView>

-#endif

+#include <QtDeclarative/QDeclarativeView>

 

 class QmlApplicationViewer : public QDeclarativeView

 {

diff --git a/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.pri
index 8e891c00..84500198 100755
--- a/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.pri
+++ b/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.pri
@@ -1,8 +1,4 @@
-greaterThan(QT_MAJOR_VERSION, 4) {

-    QT += quick1

-} else {

-    QT += declarative

-}

+QT += declarative

 

 SOURCES += $$PWD/qmlapplicationviewer.cpp

 HEADERS += $$PWD/qmlapplicationviewer.h

diff --git a/demos/qmlcustommodel/main.cpp b/demos/qmlcustommodel/main.cpp
index b4fea7c9..a17d2261 100644
--- a/demos/qmlcustommodel/main.cpp
+++ b/demos/qmlcustommodel/main.cpp
@@ -19,14 +19,8 @@
 ****************************************************************************/
 
 #include <QApplication>
-#ifdef QT5_QUICK_1
-    #include <QtQuick1/qdeclarative.h>
-    #include <QtQuick1/QDeclarativeEngine>
-#else
-    #include <QtDeclarative>
-    #include <QtDeclarative/QDeclarativeEngine>
-#endif
-//#include <QtDeclarative>
+#include <QtDeclarative>
+#include <QtDeclarative/QDeclarativeEngine>
 #include <QAbstractItemModel>
 #include "declarativemodel.h"
 #include "customtablemodel.h"
diff --git a/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.cpp
index 05ba5a39..efbf1e37 100644
--- a/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -12,15 +12,9 @@
 
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
-#ifdef QT5_QUICK_1
-    #include <QtQuick1/QDeclarativeComponent>
-    #include <QtQuick1/QDeclarativeEngine>
-    #include <QtQuick1/QDeclarativeContext>
-#else
-    #include <QtDeclarative/QDeclarativeComponent>
-    #include <QtDeclarative/QDeclarativeEngine>
-    #include <QtDeclarative/QDeclarativeContext>
-#endif
+#include <QtDeclarative/QDeclarativeComponent>
+#include <QtDeclarative/QDeclarativeEngine>
+#include <QtDeclarative/QDeclarativeContext>
 #include <QApplication>
 
 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
diff --git a/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.h b/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.h
index 7f856586..9d0fea29 100644
--- a/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.h
+++ b/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.h
@@ -11,11 +11,7 @@
 #ifndef QMLAPPLICATIONVIEWER_H
 #define QMLAPPLICATIONVIEWER_H
 
-#ifdef QT5_QUICK_1
-    #include <QtQuick1/QDeclarativeView>
-#else
-    #include <QtDeclarative/QDeclarativeView>
-#endif
+#include <QtDeclarative/QDeclarativeView>
 
 class QmlApplicationViewer : public QDeclarativeView
 {
diff --git a/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.pri
index 830526b7..567c6dc6 100644
--- a/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.pri
+++ b/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.pri
@@ -1,8 +1,4 @@
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += quick1
-} else {
-    QT += declarative
-}
+QT += declarative
 
 SOURCES += $$PWD/qmlapplicationviewer.cpp
 HEADERS += $$PWD/qmlapplicationviewer.h
diff --git a/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.cpp
index 269996b2..f204eaf4 100644
--- a/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -13,16 +13,9 @@
 #include <QDir>
 #include <QFileInfo>
 #include <QApplication>
-#ifdef QT5_QUICK_1
-    #include <QtQuick1/QDeclarativeComponent>
-    #include <QtQuick1/QDeclarativeEngine>
-    #include <QtQuick1/QDeclarativeContext>
-#else
-    #include <QtDeclarative/QDeclarativeComponent>
-    #include <QtDeclarative/QDeclarativeEngine>
-    #include <QtDeclarative/QDeclarativeContext>
-#endif
-
+#include <QtDeclarative/QDeclarativeComponent>
+#include <QtDeclarative/QDeclarativeEngine>
+#include <QtDeclarative/QDeclarativeContext>
 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
 
 #ifdef HARMATTAN_BOOSTER
diff --git a/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.h b/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.h
index c47bd7f9..49832088 100644
--- a/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.h
+++ b/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.h
@@ -11,11 +11,7 @@
 #ifndef QMLAPPLICATIONVIEWER_H
 #define QMLAPPLICATIONVIEWER_H
 
-#ifdef QT5_QUICK_1
-    #include <QtQuick1/QDeclarativeView>
-#else
-    #include <QtDeclarative/QDeclarativeView>
-#endif
+#include <QtDeclarative/QDeclarativeView>
 
 class QmlApplicationViewer : public QDeclarativeView
 {
diff --git a/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.pri
index 40bf295e..b6931d04 100644
--- a/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.pri
+++ b/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.pri
@@ -5,11 +5,7 @@
 # It is recommended not to modify this file, since newer versions of Qt Creator
 # may offer an updated version of it.
 
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += quick1
-} else {
-    QT += declarative
-}
+QT += declarative
 
 SOURCES += $$PWD/qmlapplicationviewer.cpp
 HEADERS += $$PWD/qmlapplicationviewer.h
diff --git a/demos/qmloscilloscope/main.cpp b/demos/qmloscilloscope/main.cpp
index ef2346e4..d2e29fd2 100644
--- a/demos/qmloscilloscope/main.cpp
+++ b/demos/qmloscilloscope/main.cpp
@@ -19,11 +19,7 @@
 ****************************************************************************/
 
 #include <QApplication>
-#ifdef QT5_QUICK_1
-    #include <QtQuick1/QDeclarativeContext>
-#else
-    #include <QtDeclarative/QDeclarativeContext>
-#endif
+#include <QtDeclarative/QDeclarativeContext>
 #include "qmlapplicationviewer.h"
 #include "datasource.h"
 
diff --git a/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.cpp
index 05ba5a39..efbf1e37 100644
--- a/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -12,15 +12,9 @@
 
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
-#ifdef QT5_QUICK_1
-    #include <QtQuick1/QDeclarativeComponent>
-    #include <QtQuick1/QDeclarativeEngine>
-    #include <QtQuick1/QDeclarativeContext>
-#else
-    #include <QtDeclarative/QDeclarativeComponent>
-    #include <QtDeclarative/QDeclarativeEngine>
-    #include <QtDeclarative/QDeclarativeContext>
-#endif
+#include <QtDeclarative/QDeclarativeComponent>
+#include <QtDeclarative/QDeclarativeEngine>
+#include <QtDeclarative/QDeclarativeContext>
 #include <QApplication>
 
 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
diff --git a/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.h b/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.h
index 7f856586..9d0fea29 100644
--- a/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.h
+++ b/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.h
@@ -11,11 +11,7 @@
 #ifndef QMLAPPLICATIONVIEWER_H
 #define QMLAPPLICATIONVIEWER_H
 
-#ifdef QT5_QUICK_1
-    #include <QtQuick1/QDeclarativeView>
-#else
-    #include <QtDeclarative/QDeclarativeView>
-#endif
+#include <QtDeclarative/QDeclarativeView>
 
 class QmlApplicationViewer : public QDeclarativeView
 {
diff --git a/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.pri
index 830526b7..567c6dc6 100644
--- a/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.pri
+++ b/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.pri
@@ -1,8 +1,4 @@
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += quick1
-} else {
-    QT += declarative
-}
+QT += declarative
 
 SOURCES += $$PWD/qmlapplicationviewer.cpp
 HEADERS += $$PWD/qmlapplicationviewer.h
diff --git a/demos/qmlweather/main.cpp b/demos/qmlweather/main.cpp
index bef2f6a3..10cd365d 100644
--- a/demos/qmlweather/main.cpp
+++ b/demos/qmlweather/main.cpp
@@ -19,11 +19,7 @@
 ****************************************************************************/
 
 #include <QApplication>
-#ifdef QT5_QUICK_1
-    #include <QtQuick1/QDeclarativeContext>
-#else
-    #include <QtDeclarative/QDeclarativeContext>
-#endif
+#include <QtDeclarative/QDeclarativeContext>
 #include <QDebug>
 #include "qmlapplicationviewer.h"
 
diff --git a/demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.cpp
index 862008b5..a8f9aef0 100644
--- a/demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -12,15 +12,9 @@
 
 #include <QDir>
 #include <QFileInfo>
-#ifdef QT5_QUICK_1
-    #include <QtQuick1/QDeclarativeComponent>
-    #include <QtQuick1/QDeclarativeEngine>
-    #include <QtQuick1/QDeclarativeContext>
-#else
-    #include <QtDeclarative/QDeclarativeComponent>
-    #include <QtDeclarative/QDeclarativeEngine>
-    #include <QtDeclarative/QDeclarativeContext>
-#endif
+#include <QtDeclarative/QDeclarativeComponent>
+#include <QtDeclarative/QDeclarativeEngine>
+#include <QtDeclarative/QDeclarativeContext>
 #include <QApplication>
 
 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
diff --git a/demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.pri
index 40bf295e..b6931d04 100644
--- a/demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.pri
+++ b/demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.pri
@@ -5,11 +5,7 @@
 # It is recommended not to modify this file, since newer versions of Qt Creator
 # may offer an updated version of it.
 
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += quick1
-} else {
-    QT += declarative
-}
+QT += declarative
 
 SOURCES += $$PWD/qmlapplicationviewer.cpp
 HEADERS += $$PWD/qmlapplicationviewer.h