##// END OF EJS Templates
Remove opengl dependency from oscilloscope demos....
Remove opengl dependency from oscilloscope demos. These demos do not actually use opengl for anything, so no need for the dependency. This dependency also breaks the demos in android. Change-Id: I4da2a83f11fddd416034821d233f0543ee0900ed Reviewed-by: Mika Salmela <mika.salmela@digia.com>

File last commit:

r2523:abf0d5005e35
r2525:5407eb4cd85a
Show More
main.cpp
42 lines | 1.6 KiB | text/x-c | CppLexer
Tero Ahola
Refactored QML axis handling
r1813 /****************************************************************************
**
Miikka Heikkinen
More copyright year changes
r2433 ** Copyright (C) 2013 Digia Plc
Tero Ahola
Refactored QML axis handling
r1813 ** 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$
**
****************************************************************************/
Marek Rosa
Qt5: fixed QApplication and QWidget includes
r2049 #include <QApplication>
Tero Ahola
Refactored QML axis handling
r1813 #include <QDeclarativeEngine>
Heikkinen Miikka
Fix qml application deployment for android...
r2523 #include <QDir>
Tero Ahola
Refactored QML axis handling
r1813 #include "qmlapplicationviewer.h"
Q_DECL_EXPORT int main(int argc, char *argv[])
{
QScopedPointer<QApplication> app(createApplication(argc, argv));
QScopedPointer<QmlApplicationViewer> viewer(QmlApplicationViewer::create());
Heikkinen Miikka
Fix qml application deployment for android...
r2523 #ifdef Q_OS_ANDROID
viewer->addImportPath(QString::fromLatin1("assets:/imports"));
viewer->engine()->addPluginPath(QString::fromLatin1("%1/../%2").arg(QDir::homePath(), QString::fromLatin1("lib")));
#else
viewer->addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QString::fromLatin1("imports")));
#endif
Tero Ahola
Refactored QML axis handling
r1813
Marek Rosa
Qt5: declarative fix part4...
r2055 // // viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
Tero Ahola
Refactored QML axis handling
r1813 viewer->setSource(QUrl("qrc:/qml/qmlchartaxis/main.qml"));
viewer->showExpanded();
return app->exec();
}