HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2049:467e4781e54e

Qt5: fixed QApplication and QWidget includes

Marek Rosa -

r2049:467e4781e54e

parent child

Context file:

r2049:467e4781e54e

Expand all files

demos/piechartcustomization/main.cpp +1 -1

             /****************************************************************************
             **
             ** 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 "mainwidget.h"
-            #include <QtGui/QApplication>
+            #include <QApplication>
             #include <QMainWindow>
             int main(int argc, char *argv[])
             {
                 QApplication a(argc, argv);
                 QMainWindow window;
                 MainWidget widget;
                 window.setCentralWidget(&widget);
                 window.resize(900, 600);
                 window.show();
                 return a.exec();
             }

demos/qmlaxes/main.cpp +1 -1

             /****************************************************************************
             **
             ** 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>
             #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->setSource(QUrl("qrc:/qml/qmlaxes/loader.qml"));
                 viewer->setRenderHint(QPainter::Antialiasing, true);
                 viewer->showExpanded();
                 return app->exec();
             }

demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.cpp +1 -1

             // 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>
             #include <QtDeclarative/QDeclarativeEngine>
             #include <QtDeclarative/QDeclarativeContext>
-            #include <QtGui/QApplication>
+            #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)
             {
             #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::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/qmlchart/main.cpp +1 -1

             /****************************************************************************
             **
             ** 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>
             #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->setSource(QUrl("qrc:/qml/qmlchart/loader.qml"));
                 viewer->setRenderHint(QPainter::Antialiasing, true);
                 viewer->showExpanded();
                 return app->exec();
             }

demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp +1 -1

             // 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>
             #include <QtDeclarative/QDeclarativeEngine>
             #include <QtDeclarative/QDeclarativeContext>
-            #include <QtGui/QApplication>
+            #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)
             {
             #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::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/qmlcustomizations/main.cpp +1 -1

             /****************************************************************************
             **
             ** 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>
             #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->setSource(QUrl("qrc:/qml/qmlcustomizations/loader.qml"));
                 viewer->setRenderHint(QPainter::Antialiasing, true);
                 viewer->showExpanded();
                 return app->exec();
             }

demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.cpp +1 -1

             // 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>
             #include <QtDeclarative/QDeclarativeEngine>
             #include <QtDeclarative/QDeclarativeContext>
-            #include <QtGui/QApplication>
+            #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)
             {
             #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::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/qmlcustommodel/main.cpp +1 -1

             /****************************************************************************
             **
             ** 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>
             #include <QtDeclarative>
             #include <QAbstractItemModel>
             #include "declarativemodel.h"
             #include "customtablemodel.h"
             #include "qmlapplicationviewer.h"
             const char *uri = "QmlCustomModel";
             Q_DECL_EXPORT int main(int argc, char *argv[])
             {
                 QScopedPointer<QApplication> app(createApplication(argc, argv));
                 QScopedPointer<QmlApplicationViewer> viewer(QmlApplicationViewer::create());
                 // @uri QmlCustomModel
                 qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 0, "AbstractItemModel",
                                                                QLatin1String("Trying to create uncreatable: AbstractItemModel."));
                 qmlRegisterType<DeclarativeTableModel>(uri, 1, 0, "CustomModel");
                 qmlRegisterType<DeclarativeTableModelElement>(uri, 1, 0, "CustomModelElement");
                 viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
                 viewer->setSource(QUrl("qrc:/qml/qmlcustommodel/loader.qml"));
                 viewer->setRenderHint(QPainter::Antialiasing, true);
                 viewer->showExpanded();
                 return app->exec();
             }

demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.cpp +1 -1

             // 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>
             #include <QtDeclarative/QDeclarativeEngine>
             #include <QtDeclarative/QDeclarativeContext>
-            #include <QtGui/QApplication>
+            #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)
             {
             #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::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/qmloscilloscope/main.cpp +1 -1

             /****************************************************************************
             **
             ** 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>
             #include <QDeclarativeContext>
             #include "qmlapplicationviewer.h"
             #include "datasource.h"
             Q_DECL_EXPORT int main(int argc, char *argv[])
             {
                 QScopedPointer<QApplication> app(createApplication(argc, argv));
                 QScopedPointer<QmlApplicationViewer> viewer(QmlApplicationViewer::create());
                 DataSource dataSource(viewer.data());
                 viewer->rootContext()->setContextProperty("dataSource", &dataSource);
                 viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
                 viewer->setSource(QUrl("qrc:/qml/qmloscilloscope/main.qml"));
                 viewer->showExpanded();
                 return app->exec();
             }

demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.cpp +1 -1

             // 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>
             #include <QtDeclarative/QDeclarativeEngine>
             #include <QtDeclarative/QDeclarativeContext>
-            #include <QtGui/QApplication>
+            #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)
             {
             #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::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
             }

examples/barmodelmapper/main.cpp +1 -1

             /****************************************************************************
             **
             ** 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 "tablewidget.h"
             int main(int argc, char *argv[])
             {
                 QApplication a(argc, argv);
                 TableWidget w;
                 w.show();
                 return a.exec();
             }

examples/barmodelmapper/tablewidget.h +1 -1

             /****************************************************************************
             **
             ** 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$
             **
             ****************************************************************************/
             #ifndef TABLEWIDGET_H
             #define TABLEWIDGET_H
-            #include <QtGui/QWidget>
+            #include <QWidget>
             class TableWidget : public QWidget
             {
                 Q_OBJECT
             public:
                 TableWidget(QWidget *parent = 0);
             };
             #endif // TABLEWIDGET_H

examples/modeldata/main.cpp +1 -1

             /****************************************************************************
             **
             ** 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 "tablewidget.h"
             int main(int argc, char *argv[])
             {
                 QApplication a(argc, argv);
                 TableWidget w;
                 w.show();
                 return a.exec();
             }

examples/modeldata/tablewidget.h +1 -1

             /****************************************************************************
             **
             ** 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$
             **
             ****************************************************************************/
             #ifndef TABLEWIDGET_H
             #define TABLEWIDGET_H
-            #include <QtGui/QWidget>
+            #include <QWidget>
             class TableWidget : public QWidget
             {
                 Q_OBJECT
             public:
                 TableWidget(QWidget *parent = 0);
             };
             #endif // TABLEWIDGET_H

examples/piechartdrilldown/main.cpp +1 -1

             /****************************************************************************
             **
             ** 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 "drilldownchart.h"
             #include "drilldownslice.h"
-            #include <QtGui/QApplication>
+            #include <QApplication>
             #include <QMainWindow>
             #include <QTime>
             #include <QChartView>
             #include <QLegend>
             #include <QPieSeries>
             QTCOMMERCIALCHART_USE_NAMESPACE
             int main(int argc, char *argv[])
             {
                 QApplication a(argc, argv);
                 qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
                 QMainWindow window;
                 DrilldownChart* chart = new DrilldownChart();
                 chart->setTheme(QChart::ChartThemeLight);
                 chart->setAnimationOptions(QChart::AllAnimations);
                 chart->legend()->setVisible(true);
                 chart->legend()->setAlignment(Qt::AlignRight);
                 QPieSeries* yearSeries = new QPieSeries(&window);
                 yearSeries->setName("Sales by year - All");
                 QList<QString> months;
                 months << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
                 QList<QString> names;
                 names << "Jane" << "John" << "Axel" << "Mary" << "Susan" << "Bob";
                 foreach (QString name, names) {
                     QPieSeries* series = new QPieSeries(&window);
                     series->setName("Sales by month - " + name);
                     foreach (QString month, months)
                         *series << new DrilldownSlice(qrand() % 1000, month, yearSeries);
                     QObject::connect(series, SIGNAL(clicked(QPieSlice*)), chart, SLOT(handleSliceClicked(QPieSlice*)));
                     *yearSeries << new DrilldownSlice(series->sum(), name, series);
                 }
                 QObject::connect(yearSeries, SIGNAL(clicked(QPieSlice*)), chart, SLOT(handleSliceClicked(QPieSlice*)));
                 chart->changeSeries(yearSeries);
                 QChartView* chartView = new QChartView(chart);
                 chartView->setRenderHint(QPainter::Antialiasing);
                 window.setCentralWidget(chartView);
                 window.resize(800, 500);
                 window.show();
                 return a.exec();
             }

examples/qmlpiechart/main.cpp +1 -1

             /****************************************************************************
             **
             ** 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>
             #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->setSource(QUrl("qrc:/qml/qmlpiechart/main.qml"));
                 viewer->setRenderHint(QPainter::Antialiasing, true);
                 viewer->showExpanded();
                 return app->exec();
             }

examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.cpp +1 -1

             // 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>
             #include <QtDeclarative/QDeclarativeEngine>
             #include <QtDeclarative/QDeclarativeContext>
-            #include <QtGui/QApplication>
+            #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)
             {
             #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::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
             }

examples/scatterchart/main.cpp +1 -1

             /****************************************************************************
             **
             ** 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 <QMainWindow>
             #include "chartview.h"
             QTCOMMERCIALCHART_USE_NAMESPACE
             int main(int argc, char *argv[])
             {
                 QApplication a(argc, argv);
             //![4]
                 ChartView* chartView = new ChartView();
                 QMainWindow window;
                 window.setCentralWidget(chartView);
                 window.resize(400, 300);
                 window.show();
             //![4]
                 return a.exec();
             }

examples/scatterinteractions/main.cpp +1 -1

             /****************************************************************************
             **
             ** 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 <QMainWindow>
             #include "chartview.h"
             int main(int argc, char *argv[])
             {
                 QApplication a(argc, argv);
                 QMainWindow window;
                 ChartView chartView(&window);
                 window.setCentralWidget(&chartView);
                 window.resize(400, 300);
                 window.show();
                 return a.exec();
             }

examples/stackedbarchartdrilldown/main.cpp +1 -1

             /****************************************************************************
             **
             ** 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 <QMainWindow>
             #include <QChartView>
             #include <QBarSet>
             #include <QLegend>
             #include "drilldownseries.h"
             #include "drilldownchart.h"
             QTCOMMERCIALCHART_USE_NAMESPACE
             int main(int argc, char *argv[])
             {
                 QApplication a(argc, argv);
                 QMainWindow window;
             //! [1]
                 DrilldownChart* drilldownChart =  new DrilldownChart();
                 drilldownChart->setTheme(QChart::ChartThemeBlueIcy);
                 drilldownChart->setAnimationOptions(QChart::SeriesAnimations);
             //! [1]
             //! [2]
                 // Define categories
                 QStringList months;
                 months << "May" << "Jun" << "Jul" << "Aug" << "Sep";
                 QStringList weeks;
                 weeks << "week 1" << "week 2" << "week 3" << "week 4";
                 QStringList plants;
                 plants << "Habanero" << "Lemon Drop" << "Starfish" << "Aji Amarillo";
             //! [2]
             //! [3]
                 // Create drilldown structure
                 DrilldownBarSeries* seasonSeries = new DrilldownBarSeries(months, drilldownChart);
                 seasonSeries->setName("Crop by month - Season");
                 // Each month in season series has drilldown series for weekly data
                 for (int month=0; month < months.count(); month++) {
                     // Create drilldown series for every week
                     DrilldownBarSeries* weeklySeries = new DrilldownBarSeries(weeks, drilldownChart);
                     seasonSeries->mapDrilldownSeries(month, weeklySeries);
                     // Drilling down from weekly data brings us back to season data.
                     for (int week=0; week < weeks.count(); week++) {
                         weeklySeries->mapDrilldownSeries(week, seasonSeries);
                         weeklySeries->setName(QString("Crop by week - " + months.at(month)));
                     }
                     // Use clicked signal to implement drilldown
                     QObject::connect(weeklySeries, SIGNAL(clicked(int, QBarSet*)), drilldownChart, SLOT(handleClicked(int, QBarSet*)));
                 }
                 // Enable drilldown from season series using clicked signal
                 QObject::connect(seasonSeries, SIGNAL(clicked(int, QBarSet*)), drilldownChart, SLOT(handleClicked(int, QBarSet*)));
             //! [3]
             //! [4]
                 // Fill monthly and weekly series with data
                 foreach (QString plant, plants) {
                     QBarSet* monthlyCrop = new QBarSet(plant);
                     for (int month=0; month<months.count(); month++) {
                         QBarSet* weeklyCrop = new QBarSet(plant);
                         for (int week=0; week<weeks.count(); week++) {
                             *weeklyCrop << (qrand() % 20);
                         }
                         // Get the drilldown series from season series and add crop to it.
                         seasonSeries->drilldownSeries(month)->append(weeklyCrop);
                         *monthlyCrop << weeklyCrop->sum();
                     }
                     seasonSeries->append(monthlyCrop);
                 }
             //! [4]
             //! [5]
                 // Show season series in initial view
                 drilldownChart->changeSeries(seasonSeries);
                 drilldownChart->setTitle(seasonSeries->name());
             //! [5]
             //! [6]
                 drilldownChart->axisX()->setGridLineVisible(false);
                 drilldownChart->legend()->setVisible(true);
                 drilldownChart->legend()->setAlignment(Qt::AlignBottom);
             //! [6]
                 QChartView *chartView = new QChartView(drilldownChart);
                 window.setCentralWidget(chartView);
                 window.resize(400, 300);
                 window.show();
                 return a.exec();
             }

tests/qmlchartaxis/main.cpp +1 -1

             /****************************************************************************
             **
             ** 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>
             #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->setSource(QUrl("qrc:/qml/qmlchartaxis/main.qml"));
                 viewer->showExpanded();
                 return app->exec();
             }

tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.cpp +1 -1

             // 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>
             #include <QtDeclarative/QDeclarativeEngine>
             #include <QtDeclarative/QDeclarativeContext>
-            #include <QtGui/QApplication>
+            #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)
             {
             #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::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
             }

tests/qmlchartproperties/main.cpp +1 -1

             /****************************************************************************
             **
             ** 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>
             #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->setSource(QUrl("qrc:/qml/qmlchartproperties/loader.qml"));
                 viewer->setRenderHint(QPainter::Antialiasing, true);
                 viewer->showExpanded();
                 return app->exec();
             }

tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.cpp +1 -1

             // 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>
             #include <QtDeclarative/QDeclarativeEngine>
             #include <QtDeclarative/QDeclarativeContext>
-            #include <QtGui/QApplication>
+            #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)
             {
             #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::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
             }

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