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

In QML axisXTop didn't go top...

In QML axisXTop didn't go top It looked like the signal was connected to wrong slot. Probably copy&paste bug. Change-Id: Ie4887970891f3b902b71fb0b686c4adbbc1d48b1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

Miikka Heikkinen - - Load All Authors

File last commit:

r2574:599370d0561c


                r2576:dee90918a18a

Download file

             main.cpp
        
                    48 lines
            
             | 1.6 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / demos / quick2oscilloscope / main.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Miikka Heikkinen
    
Generate charts plugin for QtQuick2 as well as QtQuick1...

              r2488
            
      /****************************************************************************

      **

      ** Copyright (C) 2013 Digia Plc

      ** All rights reserved.

      ** For any questions to Digia, please use contact form at http://qt.digia.com

      **

        Miikka Heikkinen
    
Qt Commercial -> Qt Enterprise...

              r2574
            
      ** This file is part of the Qt Enterprise Charts Add-on.

        Miikka Heikkinen
    
Generate charts plugin for QtQuick2 as well as QtQuick1...

              r2488
            
      **

      ** $QT_BEGIN_LICENSE$

        Miikka Heikkinen
    
Qt Commercial -> Qt Enterprise...

              r2574
            
      ** Licensees holding valid Qt Enterprise licenses may use this file in

      ** accordance with the Qt Enterprise License Agreement provided with the

        Miikka Heikkinen
    
Generate charts plugin for QtQuick2 as well as QtQuick1...

              r2488
            
      ** 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 <QtWidgets/QApplication>

      #include <QtQuick/QQuickItem>

      #include <QtQml/QQmlContext>

        Heikkinen Miikka
    
Fix qml application deployment for android...

              r2523
            
      #include <QtQml/QQmlEngine>

      #include <QDir>

        Miikka Heikkinen
    
Generate charts plugin for QtQuick2 as well as QtQuick1...

              r2488
            
      #include "qtquick2applicationviewer.h"

      #include "datasource.h"

      int main(int argc, char *argv[])

      {

          QApplication app(argc, argv);

          QtQuick2ApplicationViewer viewer;

        Heikkinen Miikka
    
Fix qml application deployment for android...

              r2523
            
      #ifdef Q_OS_ANDROID

          viewer.addImportPath(QString::fromLatin1("assets:/qml"));

          viewer.engine()->addPluginPath(QString::fromLatin1("%1/../%2").arg(QDir::homePath(), QString::fromLatin1("lib")));

      #else

        Miikka Heikkinen
    
Make creator stop whining about changed generated files...

              r2511
            
          viewer.addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QString::fromLatin1("qml")));

        Heikkinen Miikka
    
Fix qml application deployment for android...

              r2523
            
      #endif

        Miikka Heikkinen
    
Generate charts plugin for QtQuick2 as well as QtQuick1...

              r2488
            
          DataSource dataSource(&viewer);

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

          viewer.setSource(QUrl("qrc:/qml/quick2oscilloscope/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

Miikka Heikkinen Generate charts plugin for QtQuick2 as well as QtQuick1...	r2488	/****************************************************************************
		**
		** Copyright (C) 2013 Digia Plc
		** All rights reserved.
		** For any questions to Digia, please use contact form at http://qt.digia.com
		**
Miikka Heikkinen Qt Commercial -> Qt Enterprise...	r2574	** This file is part of the Qt Enterprise Charts Add-on.
Miikka Heikkinen Generate charts plugin for QtQuick2 as well as QtQuick1...	r2488	**
		** $QT_BEGIN_LICENSE$
Miikka Heikkinen Qt Commercial -> Qt Enterprise...	r2574	** Licensees holding valid Qt Enterprise licenses may use this file in
		** accordance with the Qt Enterprise License Agreement provided with the
Miikka Heikkinen Generate charts plugin for QtQuick2 as well as QtQuick1...	r2488	** 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 <QtWidgets/QApplication>
		#include <QtQuick/QQuickItem>
		#include <QtQml/QQmlContext>
Heikkinen Miikka Fix qml application deployment for android...	r2523	#include <QtQml/QQmlEngine>
		#include <QDir>
Miikka Heikkinen Generate charts plugin for QtQuick2 as well as QtQuick1...	r2488	#include "qtquick2applicationviewer.h"
		#include "datasource.h"

		int main(int argc, char *argv[])
		{
		QApplication app(argc, argv);

		QtQuick2ApplicationViewer viewer;
Heikkinen Miikka Fix qml application deployment for android...	r2523	#ifdef Q_OS_ANDROID
		viewer.addImportPath(QString::fromLatin1("assets:/qml"));
		viewer.engine()->addPluginPath(QString::fromLatin1("%1/../%2").arg(QDir::homePath(), QString::fromLatin1("lib")));
		#else
Miikka Heikkinen Make creator stop whining about changed generated files...	r2511	viewer.addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QString::fromLatin1("qml")));
Heikkinen Miikka Fix qml application deployment for android...	r2523	#endif
Miikka Heikkinen Generate charts plugin for QtQuick2 as well as QtQuick1...	r2488
		DataSource dataSource(&viewer);
		viewer.rootContext()->setContextProperty("dataSource", &dataSource);

		viewer.setSource(QUrl("qrc:/qml/quick2oscilloscope/main.qml"));
		viewer.showExpanded();

		return app.exec();
		}