HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · tests/qmlchartaxis/main.cpp

Return empty brush/pen/font via API rather than the weird default one...

Return empty brush/pen/font via API rather than the weird default one Previously a non-initialized QPen()/QBrush()/QFont() was returned if axis/series hadn't been added to a chart yet and therefore had not been themed yet. To keep API somewhat consistent with old behavior, return non-initialized QPen()/QBrush()/QFont() instead of the weird default one in these cases. The new behavior is slightly different in that it is no longer possible to restore themed behavior by setting pen/brush/font to non-initialized one, but since there is no way to differentiate e.g. legitimate Qt::black pen from non-initialized pen, we can no longer support this behavior. Change-Id: I99f3d8853b329b5345e3073c040d8bfa8b9b75b4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

Miikka Heikkinen - - Load All Authors

File last commit:

r2511:5947c46dff64


                r2519:9ea7d7fe3500

Download file

             main.cpp
        
                    36 lines
            
             | 1.4 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / tests / qmlchartaxis / main.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        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>

      #include "qmlapplicationviewer.h"

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

      {

          QScopedPointer<QApplication> app(createApplication(argc, argv));

          QScopedPointer<QmlApplicationViewer> viewer(QmlApplicationViewer::create());

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

              r2511
            
          viewer->addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("imports")));

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

      }

	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 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>
		#include "qmlapplicationviewer.h"

		Q_DECL_EXPORT int main(int argc, char *argv[])
		{
		QScopedPointer<QApplication> app(createApplication(argc, argv));
		QScopedPointer<QmlApplicationViewer> viewer(QmlApplicationViewer::create());
Miikka Heikkinen Make creator stop whining about changed generated files...	r2511	viewer->addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("imports")));
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();
		}