Modify QtQuick1 to build in Qt5

Change-Id: I1c5ccaef420e8f119e761f50b969127f430df7ba
Reviewed-by: Martin Jones <martin.jones@nokia.com>

22 files changed, 34 insertions, 101 deletions

diff --git a/demos/declarative/calculator/main.cpp b/demos/declarative/calculator/main.cpp
index cb79f857..1ba16cae 100644
--- a/demos/declarative/calculator/main.cpp
+++ b/demos/declarative/calculator/main.cpp
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 #include "qmlapplicationviewer.h"
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 #include <QtCore/QDebug>
 
 Q_DECL_EXPORT int main(int argc, char *argv[])
diff --git a/demos/declarative/flickr/main.cpp b/demos/declarative/flickr/main.cpp
index ab5ad2b9..5cc4e047 100644
--- a/demos/declarative/flickr/main.cpp
+++ b/demos/declarative/flickr/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/demos/declarative/minehunt/main.cpp b/demos/declarative/minehunt/main.cpp
index 8d3c5457..2089703d 100644
--- a/demos/declarative/minehunt/main.cpp
+++ b/demos/declarative/minehunt/main.cpp
@@ -41,9 +41,9 @@
 
 #include "qmlapplicationviewer.h"
 #include "minehunt.h"
-#include <QtGui/QApplication>
-#include <QtDeclarative/QDeclarativeContext>
-#include <QtDeclarative/QDeclarativeEngine>
+#include <QtWidgets/QApplication>
+#include <QtQuick1/QDeclarativeContext>
+#include <QtQuick1/QDeclarativeEngine>
 
 int main(int argc, char *argv[])
 {
diff --git a/demos/declarative/minehunt/minehunt.pro b/demos/declarative/minehunt/minehunt.pro
index 5c0b7078..29af4ccb 100644
--- a/demos/declarative/minehunt/minehunt.pro
+++ b/demos/declarative/minehunt/minehunt.pro
@@ -20,6 +20,8 @@ symbian:{
     TARGET.EPOCALLOWDLLDATA = 1
     TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
     include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+    qmlminehuntfiles.files = MinehuntCore minehunt.qml
+    DEPLOYMENT += qmlminehuntfiles
 }
 
 # Allow network access on Symbian
diff --git a/demos/declarative/photoviewer/main.cpp b/demos/declarative/photoviewer/main.cpp
index e0988bac..9632fe72 100644
--- a/demos/declarative/photoviewer/main.cpp
+++ b/demos/declarative/photoviewer/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/demos/declarative/rssnews/main.cpp b/demos/declarative/rssnews/main.cpp
index d3f6026e..862834fe 100644
--- a/demos/declarative/rssnews/main.cpp
+++ b/demos/declarative/rssnews/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/demos/declarative/samegame/main.cpp b/demos/declarative/samegame/main.cpp
index 819e86b1..6ef94e85 100644
--- a/demos/declarative/samegame/main.cpp
+++ b/demos/declarative/samegame/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/demos/declarative/snake/main.cpp b/demos/declarative/snake/main.cpp
index cd2b5126..11241cf4 100644
--- a/demos/declarative/snake/main.cpp
+++ b/demos/declarative/snake/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/demos/declarative/twitter/main.cpp b/demos/declarative/twitter/main.cpp
index 0599f316..24948847 100644
--- a/demos/declarative/twitter/main.cpp
+++ b/demos/declarative/twitter/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/demos/declarative/webbrowser/main.cpp b/demos/declarative/webbrowser/main.cpp
index abbfd04f..1b59d853 100644
--- a/demos/declarative/webbrowser/main.cpp
+++ b/demos/declarative/webbrowser/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/demos/demos.pro b/demos/demos.pro
new file mode 100644
index 00000000..f80ed204
--- /dev/null
+++ b/demos/demos.pro
@@ -0,0 +1,2 @@
+TEMPLATE    = subdirs
+SUBDIRS += declarative helper
diff --git a/demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp
index 570f68f3..d8a9336b 100644
--- a/demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/demos/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/demos/helper/qmlapplicationviewer/qmlapplicationviewer.h b/demos/helper/qmlapplicationviewer/qmlapplicationviewer.h
index 85c02ab6..d8ef27e0 100644
--- a/demos/helper/qmlapplicationviewer/qmlapplicationviewer.h
+++ b/demos/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/demos/helper/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/helper/qmlapplicationviewer/qmlapplicationviewer.pri
index 6809b644..2feb9e0d 100644
--- a/demos/helper/qmlapplicationviewer/qmlapplicationviewer.pri
+++ b/demos/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/demos/mobile/guitartuner/guitartuner.pro b/demos/mobile/guitartuner/guitartuner.pro
index 62835300..b86f4778 100644
--- a/demos/mobile/guitartuner/guitartuner.pro
+++ b/demos/mobile/guitartuner/guitartuner.pro
@@ -4,7 +4,7 @@
 #
 #-------------------------------------------------
 
-QT       += core gui
+QT       += core gui widgets
 
 TARGET = guitartuner
 TEMPLATE = app
@@ -65,8 +65,8 @@ symbian {
     TARGET.CAPABILITY = UserEnvironment
 }
 
-# Add declarative module
-QT       += declarative
+# Add quick1 module
+QT       += quick1
 
 OTHER_FILES += \
     src/application.qml \
diff --git a/demos/mobile/guitartuner/src/guitartuner.cpp b/demos/mobile/guitartuner/src/guitartuner.cpp
index 43222f2d..35c553b3 100644
--- a/demos/mobile/guitartuner/src/guitartuner.cpp
+++ b/demos/mobile/guitartuner/src/guitartuner.cpp
@@ -320,40 +320,6 @@ void GuitarTuner::setMaxVolumeLevel(qreal percent)
   */
 void GuitarTuner::setOrientation(Orientation orientation)
 {
-#ifdef Q_OS_SYMBIAN
-    if (orientation != Auto) {
-#if defined(ORIENTATIONLOCK)
-        const CAknAppUiBase::TAppUiOrientation uiOrientation =
-                (orientation == LockPortrait)
-                    ? CAknAppUi::EAppUiOrientationPortrait
-                    : CAknAppUi::EAppUiOrientationLandscape;
-        CAknAppUi* appUi = dynamic_cast<CAknAppUi*>
-                (CEikonEnv::Static()->AppUi());
-        TRAPD(error,
-            if (appUi)
-                appUi->SetOrientationL(uiOrientation);
-        );
-#else // ORIENTATIONLOCK
-        qWarning(QString("'ORIENTATIONLOCK' needs to be defined on")
-                 +QString(" Symbian when locking the orientation."));
-#endif // ORIENTATIONLOCK
-    }
-#elif defined(Q_WS_MAEMO_5)
-    Qt::WidgetAttribute attribute;
-    switch (orientation) {
-    case LockPortrait:
-        attribute = Qt::WA_Maemo5PortraitOrientation;
-        break;
-    case LockLandscape:
-        attribute = Qt::WA_Maemo5LandscapeOrientation;
-        break;
-    case Auto:
-    default:
-        attribute = Qt::WA_Maemo5AutoOrientation;
-        break;
-    }
-    setAttribute(attribute, true);
-#else // Q_OS_SYMBIAN
-    Q_UNUSED(orientation);
-#endif // Q_OS_SYMBIAN
+    // TODO: Needs a Qt5 implmentation
+    Q_UNUSED(orientation)
 }
diff --git a/demos/mobile/guitartuner/src/guitartuner.h b/demos/mobile/guitartuner/src/guitartuner.h
index fbb16f7c..fdac53fa 100644
--- a/demos/mobile/guitartuner/src/guitartuner.h
+++ b/demos/mobile/guitartuner/src/guitartuner.h
@@ -42,7 +42,7 @@
 #define MAINWINDOW_H
 
 #include <QMainWindow>
-#include <QtDeclarative>
+#include <QtQuick1>
 #include <QAudioDeviceInfo>
 #include <QAudioOutput>
 #include <QAudioInput>
diff --git a/demos/mobile/guitartuner/src/main.cpp b/demos/mobile/guitartuner/src/main.cpp
index 7ddd1f78..39307934 100644
--- a/demos/mobile/guitartuner/src/main.cpp
+++ b/demos/mobile/guitartuner/src/main.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 #include "guitartuner.h"
 
 int main(int argc, char *argv[])
diff --git a/demos/mobile/qtbubblelevel/main.cpp b/demos/mobile/qtbubblelevel/main.cpp
index df1393dd..a8de03c4 100644
--- a/demos/mobile/qtbubblelevel/main.cpp
+++ b/demos/mobile/qtbubblelevel/main.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtDeclarative>
+#include <QtQuick1>
 #include <QtGui>
 #include <QAccelerometer>
 
diff --git a/demos/mobile/qtbubblelevel/qtbubblelevel.pro b/demos/mobile/qtbubblelevel/qtbubblelevel.pro
index 3314815b..93c676c6 100644
--- a/demos/mobile/qtbubblelevel/qtbubblelevel.pro
+++ b/demos/mobile/qtbubblelevel/qtbubblelevel.pro
@@ -1,4 +1,4 @@
-QT       += core gui declarative
+QT       += core gui quick1
 CONFIG   += mobility
 MOBILITY += sensors
 
diff --git a/demos/mobile/quickhit/main.cpp b/demos/mobile/quickhit/main.cpp
index e6e021da..fbfd4ceb 100644
--- a/demos/mobile/quickhit/main.cpp
+++ b/demos/mobile/quickhit/main.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 #include <QDesktopWidget>
 #include "mainwindow.h"
 
diff --git a/demos/mobile/quickhit/quickhit.pro b/demos/mobile/quickhit/quickhit.pro
index 44bf09b6..70a8145b 100644
--- a/demos/mobile/quickhit/quickhit.pro
+++ b/demos/mobile/quickhit/quickhit.pro
@@ -1,4 +1,4 @@
-QT       += core gui declarative opengl
+QT       += core gui quick1 opengl
 
 VERSION = 1.1.1