HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · demos/qmloscilloscope/main.cpp

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>

Heikkinen Miikka - - Load All Authors

File last commit:

r2523:abf0d5005e35


                r2525:5407eb4cd85a

Download file

             main.cpp
        
                    47 lines
            
             | 1.8 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / demos / qmloscilloscope / main.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Tero Ahola
    
Added a new QXYSeries::replace override for performance reasons....

              r1783
            
      /****************************************************************************

      **

        Miikka Heikkinen
    
More copyright year changes

              r2433
            
      ** Copyright (C) 2013 Digia Plc

        Tero Ahola
    
Added a new QXYSeries::replace override for performance reasons....

              r1783
            
      ** 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>

        Jani Honkonen
    
Fixing qml build for latest Qt5...

              r2247
            
      #include <QtDeclarative/QDeclarativeContext>

        Heikkinen Miikka
    
Fix qml application deployment for android...

              r2523
            
      #include <QtDeclarative/QDeclarativeEngine>

      #include <QDir>

        Tero Ahola
    
Added a new QXYSeries::replace override for performance reasons....

              r1783
            
      #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());

        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
    
Added a new QXYSeries::replace override for performance reasons....

              r1783
            
        Tero Ahola
    
Improved oscilloscope demo functionality

              r1785
            
          DataSource dataSource(viewer.data());

        Tero Ahola
    
Added a new QXYSeries::replace override for performance reasons....

              r1783
            
          viewer->rootContext()->setContextProperty("dataSource", &dataSource);

        Marek Rosa
    
Qt5: declarative fix part2...

              r2053
            
          // // viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);

        Tero Ahola
    
Added a new QXYSeries::replace override for performance reasons....

              r1783
            
          viewer->setSource(QUrl("qrc:/qml/qmloscilloscope/main.qml"));

          viewer->showExpanded();

          return app->exec();

      }

	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

Tero Ahola Added a new QXYSeries::replace override for performance reasons....	r1783	/****************************************************************************
		**
Miikka Heikkinen More copyright year changes	r2433	** Copyright (C) 2013 Digia Plc
Tero Ahola Added a new QXYSeries::replace override for performance reasons....	r1783	** 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>
Jani Honkonen Fixing qml build for latest Qt5...	r2247	#include <QtDeclarative/QDeclarativeContext>
Heikkinen Miikka Fix qml application deployment for android...	r2523	#include <QtDeclarative/QDeclarativeEngine>
		#include <QDir>
Tero Ahola Added a new QXYSeries::replace override for performance reasons....	r1783	#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());
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 Added a new QXYSeries::replace override for performance reasons....	r1783
Tero Ahola Improved oscilloscope demo functionality	r1785	DataSource dataSource(viewer.data());
Tero Ahola Added a new QXYSeries::replace override for performance reasons....	r1783	viewer->rootContext()->setContextProperty("dataSource", &dataSource);

Marek Rosa Qt5: declarative fix part2...	r2053	// // viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
Tero Ahola Added a new QXYSeries::replace override for performance reasons....	r1783	viewer->setSource(QUrl("qrc:/qml/qmloscilloscope/main.qml"));
		viewer->showExpanded();

		return app->exec();
		}