1 files changed, 69 insertions, 92 deletions

diff --git a/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp
index efbf1e37..0f12265e 100644
--- a/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -1,4 +1,4 @@
-// checksum 0x78c version 0x60010
+// checksum 0xbd34 version 0x80016
 /*
   This file was generated by the Qt Quick Application wizard of Qt Creator.
   QmlApplicationViewer is a convenience class containing mobile device specific
@@ -10,12 +10,12 @@
 
 #include "qmlapplicationviewer.h"
 
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtDeclarative/QDeclarativeComponent>
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QtDeclarative/QDeclarativeContext>
+#include <QDir>
+#include <QFileInfo>
 #include <QApplication>
+#include <QDeclarativeComponent>
+#include <QDeclarativeEngine>
+#include <QDeclarativeContext>
 
 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
 
@@ -50,63 +50,47 @@ static QmlJsDebuggingEnabler enableDebuggingHelper;
 
 class QmlApplicationViewerPrivate
 {
-    QmlApplicationViewerPrivate(QDeclarativeView *view_) : view(view_) {}
-
     QString mainQmlFile;
-    QDeclarativeView *view;
     friend class QmlApplicationViewer;
-    QString adjustPath(const QString &path);
+    static QString adjustPath(const QString &path);
 };
 
 QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
 {
-#ifdef Q_OS_UNIX
 #ifdef Q_OS_MAC
     if (!QDir::isAbsolutePath(path))
-        return QCoreApplication::applicationDirPath()
-                + QLatin1String("/../Resources/") + path;
-#else
-    QString pathInInstallDir;
-    const QString applicationDirPath = QCoreApplication::applicationDirPath();
-    pathInInstallDir = QString::fromAscii("%1/../%2").arg(applicationDirPath, path);
-
+        return QString::fromLatin1("%1/../Resources/%2")
+                .arg(QCoreApplication::applicationDirPath(), path);
+#elif defined(Q_OS_QNX)
+    if (!QDir::isAbsolutePath(path))
+        return QString::fromLatin1("app/native/%1").arg(path);
+#elif !defined(Q_OS_ANDROID)
+    QString pathInInstallDir =
+            QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
+    if (QFileInfo(pathInInstallDir).exists())
+        return pathInInstallDir;
+    pathInInstallDir =
+            QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), path);
     if (QFileInfo(pathInInstallDir).exists())
         return pathInInstallDir;
-#endif
 #endif
     return path;
 }
 
 QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)
     : QDeclarativeView(parent)
-    , d(new QmlApplicationViewerPrivate(this))
+    , d(new QmlApplicationViewerPrivate())
 {
     connect(engine(), SIGNAL(quit()), SLOT(close()));
     setResizeMode(QDeclarativeView::SizeRootObjectToView);
-    // Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
-#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
-#if !defined(NO_JSDEBUGGER)
-    new QmlJSDebugger::JSDebuggerAgent(d->view->engine());
-#endif
-#if !defined(NO_QMLOBSERVER)
-    new QmlJSDebugger::QDeclarativeViewObserver(d->view, d->view);
-#endif
-#endif
-}
 
-QmlApplicationViewer::QmlApplicationViewer(QDeclarativeView *view, QWidget *parent)
-    : QDeclarativeView(parent)
-    , d(new QmlApplicationViewerPrivate(view))
-{
-    connect(view->engine(), SIGNAL(quit()), view, SLOT(close()));
-    view->setResizeMode(QDeclarativeView::SizeRootObjectToView);
     // Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
 #if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
 #if !defined(NO_JSDEBUGGER)
-    new QmlJSDebugger::JSDebuggerAgent(d->view->engine());
+    new QmlJSDebugger::JSDebuggerAgent(engine());
 #endif
 #if !defined(NO_QMLOBSERVER)
-    new QmlJSDebugger::QDeclarativeViewObserver(d->view, d->view);
+    new QmlJSDebugger::QDeclarativeViewObserver(this, this);
 #endif
 #endif
 }
@@ -118,75 +102,68 @@ QmlApplicationViewer::~QmlApplicationViewer()
 
 QmlApplicationViewer *QmlApplicationViewer::create()
 {
-#ifdef HARMATTAN_BOOSTER
-    return new QmlApplicationViewer(MDeclarativeCache::qDeclarativeView(), 0);
-#else
     return new QmlApplicationViewer();
-#endif
 }
 
 void QmlApplicationViewer::setMainQmlFile(const QString &file)
 {
-    d->mainQmlFile = d->adjustPath(file);
-    d->view->setSource(QUrl::fromLocalFile(d->mainQmlFile));
+    d->mainQmlFile = QmlApplicationViewerPrivate::adjustPath(file);
+#ifdef Q_OS_ANDROID
+    setSource(QUrl(QLatin1String("assets:/")+d->mainQmlFile));
+#else
+    setSource(QUrl::fromLocalFile(d->mainQmlFile));
+#endif
 }
 
 void QmlApplicationViewer::addImportPath(const QString &path)
 {
-    d->view->engine()->addImportPath(d->adjustPath(path));
+    engine()->addImportPath(QmlApplicationViewerPrivate::adjustPath(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);
-//}
+void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
+{
+#if QT_VERSION < 0x050000
+    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);
+#else // QT_VERSION < 0x050000
+    Q_UNUSED(orientation)
+#endif // QT_VERSION < 0x050000
+}
 
 void QmlApplicationViewer::showExpanded()
 {
-#if defined(Q_OS_SYMBIAN) || defined(MEEGO_EDITION_HARMATTAN) || defined(Q_WS_SIMULATOR)
-    d->view->showFullScreen();
-#elif defined(Q_WS_MAEMO_5)
-    d->view->showMaximized();
+#if defined(MEEGO_EDITION_HARMATTAN) || defined(Q_WS_SIMULATOR)
+    showFullScreen();
+#elif defined(Q_WS_MAEMO_5) || defined(Q_OS_QNX)
+    showMaximized();
 #else
-    d->view->show();
+    show();
 #endif
 }