HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2077:816c8c6e440e

qmlcustomlegend: fix qt5 build

Jani Honkonen -

r2077:816c8c6e440e

parent child

Context file:

r2077:816c8c6e440e

Collapse all files

demos/qmlcustomlegend/main.cpp +7 -3

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
-            #include <QtGui/QApplication>
+            #include <QApplication>
-            #include <QDeclarativeEngine>
+            #ifdef QT5_QUICK_1
+                #include <QtQuick1/QDeclarativeEngine>
+            #else
+                #include <QtDeclarative/QDeclarativeEngine>
+            #endif
             #include "qmlapplicationviewer.h"
             Q_DECL_EXPORT int main(int argc, char *argv[])
             {
                 QScopedPointer<QApplication> app(createApplication(argc, argv));
                 QScopedPointer<QmlApplicationViewer> viewer(QmlApplicationViewer::create());
-                viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
+                //viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
                 viewer->setSource(QUrl("qrc:/qml/qmlcustomlegend/loader.qml"));
                 viewer->setRenderHint(QPainter::Antialiasing, true);
                 viewer->showExpanded();
                 return app->exec();
             }

demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.cpp +52 -46

             // checksum 0x78c version 0x60010
             /*
               This file was generated by the Qt Quick Application wizard of Qt Creator.
               QmlApplicationViewer is a convenience class containing mobile device specific
               code such as screen orientation handling. Also QML paths and debugging are
               handled here.
               It is recommended not to modify this file, since newer versions of Qt Creator
               may offer an updated version of it.
             */
             #include "qmlapplicationviewer.h"
             #include <QtCore/QDir>
             #include <QtCore/QFileInfo>
-            #include <QtDeclarative/QDeclarativeComponent>
+            #ifdef QT5_QUICK_1
-            #include <QtDeclarative/QDeclarativeEngine>
+                #include <QtQuick1/QDeclarativeComponent>
-            #include <QtDeclarative/QDeclarativeContext>
+                #include <QtQuick1/QDeclarativeEngine>
-            #include <QtGui/QApplication>
+                #include <QtQuick1/QDeclarativeContext>
+            #else
+                #include <QtDeclarative/QDeclarativeComponent>
+                #include <QtDeclarative/QDeclarativeEngine>
+                #include <QtDeclarative/QDeclarativeContext>
+            #endif
+            #include <QApplication>
             #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
             #ifdef HARMATTAN_BOOSTER
             #include <MDeclarativeCache>
             #endif
             #if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
             #include <qt_private/qdeclarativedebughelper_p.h>
             #if !defined(NO_JSDEBUGGER)
             #include <jsdebuggeragent.h>
             #endif
             #if !defined(NO_QMLOBSERVER)
             #include <qdeclarativeviewobserver.h>
             #endif
             // Enable debugging before any QDeclarativeEngine is created
             struct QmlJsDebuggingEnabler
             {
                 QmlJsDebuggingEnabler()
                 {
                     QDeclarativeDebugHelper::enableDebugging();
                 }
             };
             // Execute code in constructor before first QDeclarativeEngine is instantiated
             static QmlJsDebuggingEnabler enableDebuggingHelper;
             #endif // QMLJSDEBUGGER
             class QmlApplicationViewerPrivate
             {
                 QmlApplicationViewerPrivate(QDeclarativeView *view_) : view(view_) {}
                 QString mainQmlFile;
                 QDeclarativeView *view;
                 friend class QmlApplicationViewer;
                 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);
                 if (QFileInfo(pathInInstallDir).exists())
                     return pathInInstallDir;
             #endif
             #endif
                 return path;
             }
             QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)
                 : QDeclarativeView(parent)
                 , d(new QmlApplicationViewerPrivate(this))
             {
                 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());
             #endif
             #if !defined(NO_QMLOBSERVER)
                 new QmlJSDebugger::QDeclarativeViewObserver(d->view, d->view);
             #endif
             #endif
             }
             QmlApplicationViewer::~QmlApplicationViewer()
             {
                 delete d;
             }
             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));
             }
             void QmlApplicationViewer::addImportPath(const QString &path)
             {
                 d->view->engine()->addImportPath(d->adjustPath(path));
             }
-            void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
+            //void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
+            //{
-            #if defined(Q_OS_SYMBIAN)
+            //#if defined(Q_OS_SYMBIAN)
-                // If the version of Qt on the device is < 4.7.2, that attribute won't work
+            //    // If the version of Qt on the device is < 4.7.2, that attribute won't work
-                if (orientation != ScreenOrientationAuto) {
+            //    if (orientation != ScreenOrientationAuto) {
-                    const QStringList v = QString::fromAscii(qVersion()).split(QLatin1Char('.'));
+            //        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) {
+            //        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");
+            //            qWarning("Screen orientation locking only supported with Qt 4.7.2 and above");
-                        return;
+            //            return;
+            //        }
+            //    }
-            #endif // Q_OS_SYMBIAN
+            //#endif // Q_OS_SYMBIAN
-                Qt::WidgetAttribute attribute;
+            //    Qt::WidgetAttribute attribute;
-                switch (orientation) {
+            //    switch (orientation) {
-            #if QT_VERSION < 0x040702
+            //#if QT_VERSION < 0x040702
-                // Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes
+            //    // Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes
-                case ScreenOrientationLockPortrait:
+            //    case ScreenOrientationLockPortrait:
-                    attribute = static_cast<Qt::WidgetAttribute>(128);
+            //        attribute = static_cast<Qt::WidgetAttribute>(128);
-                    break;
+            //        break;
-                case ScreenOrientationLockLandscape:
+            //    case ScreenOrientationLockLandscape:
-                    attribute = static_cast<Qt::WidgetAttribute>(129);
+            //        attribute = static_cast<Qt::WidgetAttribute>(129);
-                    break;
+            //        break;
-                default:
+            //    default:
-                case ScreenOrientationAuto:
+            //    case ScreenOrientationAuto:
-                    attribute = static_cast<Qt::WidgetAttribute>(130);
+            //        attribute = static_cast<Qt::WidgetAttribute>(130);
-                    break;
+            //        break;
-            #else // QT_VERSION < 0x040702
+            //#else // QT_VERSION < 0x040702
-                case ScreenOrientationLockPortrait:
+            //    case ScreenOrientationLockPortrait:
-                    attribute = Qt::WA_LockPortraitOrientation;
+            //        attribute = Qt::WA_LockPortraitOrientation;
-                    break;
+            //        break;
-                case ScreenOrientationLockLandscape:
+            //    case ScreenOrientationLockLandscape:
-                    attribute = Qt::WA_LockLandscapeOrientation;
+            //        attribute = Qt::WA_LockLandscapeOrientation;
-                    break;
+            //        break;
-                default:
+            //    default:
-                case ScreenOrientationAuto:
+            //    case ScreenOrientationAuto:
-                    attribute = Qt::WA_AutoOrientation;
+            //        attribute = Qt::WA_AutoOrientation;
-                    break;
+            //        break;
-            #endif // QT_VERSION < 0x040702
+            //#endif // QT_VERSION < 0x040702
-                };
+            //    };
-                setAttribute(attribute, true);
+            //    setAttribute(attribute, true);
+            //}
             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();
             #else
                 d->view->show();
             #endif
             }
             QApplication *createApplication(int &argc, char **argv)
             {
             #ifdef HARMATTAN_BOOSTER
                 return MDeclarativeCache::qApplication(argc, argv);
             #else
                 return new QApplication(argc, argv);
             #endif
             }

demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.h +6 -2

             // checksum 0x82ed version 0x60010
             /*
               This file was generated by the Qt Quick Application wizard of Qt Creator.
               QmlApplicationViewer is a convenience class containing mobile device specific
               code such as screen orientation handling. Also QML paths and debugging are
               handled here.
               It is recommended not to modify this file, since newer versions of Qt Creator
               may offer an updated version of it.
             */
             #ifndef QMLAPPLICATIONVIEWER_H
             #define QMLAPPLICATIONVIEWER_H
-            #include <QtDeclarative/QDeclarativeView>
+            #ifdef QT5_QUICK_1
+                #include <QtQuick1/QDeclarativeView>
+            #else
+                #include <QtDeclarative/QDeclarativeView>
+            #endif
             class QmlApplicationViewer : public QDeclarativeView
             {
                 Q_OBJECT
             public:
                 enum ScreenOrientation {
                     ScreenOrientationLockPortrait,
                     ScreenOrientationLockLandscape,
                     ScreenOrientationAuto
                 };
                 explicit QmlApplicationViewer(QWidget *parent = 0);
                 virtual ~QmlApplicationViewer();
                 static QmlApplicationViewer *create();
                 void setMainQmlFile(const QString &file);
                 void addImportPath(const QString &path);
                 // Note that this will only have an effect on Symbian and Fremantle.
-                void setOrientation(ScreenOrientation orientation);
+                // void setOrientation(ScreenOrientation orientation);
                 void showExpanded();
             private:
                 explicit QmlApplicationViewer(QDeclarativeView *view, QWidget *parent);
                 class QmlApplicationViewerPrivate *d;
             };
             QApplication *createApplication(int &argc, char **argv);
             #endif // QMLAPPLICATIONVIEWER_H

demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.pri +5 -1

-            QT += declarative
+            greaterThan(QT_MAJOR_VERSION, 4) {
+                QT += quick1
+            } else {
+                QT += declarative
+            }
             SOURCES += $$PWD/qmlapplicationviewer.cpp
             HEADERS += $$PWD/qmlapplicationviewer.h
             INCLUDEPATH += $$PWD
             # Include JS debugger library if QMLJSDEBUGGER_PATH is set
             !isEmpty(QMLJSDEBUGGER_PATH) {
                 include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
             } else {
                 DEFINES -= QMLJSDEBUGGER
             }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages