HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · demos/demos.pro

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:

r2488:5862599d088d


                r2519:9ea7d7fe3500

Download file

             demos.pro
        
                    37 lines
            
             | 918 B
            
                | text/idl
            
             |
                PrologLexer
            
             / demos / demos.pro
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      CURRENTLY_BUILDING_COMPONENTS = "demos"

      !include( ../config.pri ) {

          error( "Couldn't find the config.pri file!" )

      }

      TEMPLATE = subdirs

      SUBDIRS += piechartcustomization \

                 dynamicspline \

                 nesteddonuts \

                 qmlchart \

                 qmlweather \

                 qmlf1legends \

                 qmlcustomizations \

                 qmlcustommodel \

                 chartinteractions \

                 qmlaxes \

                 qmlcustomlegend \

                 callout \

                 qmlpolarchart

      contains(QT_CONFIG, opengl) {

              SUBDIRS +=  chartthemes \

                          qmloscilloscope

      } else {

          message("OpenGL not available. Some demos are disabled")

      }

      contains(QT_CONFIG, multimedia) {

              SUBDIRS += audio

      } else {

          message("QtMultimedia library not available. Some demos are disabled")

      }

      contains(QT_VERSION, ^5\\..*\\..*$):qtHaveModule(quick) {

          SUBDIRS += quick2chart \

          quick2oscilloscope

      }

	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

				CURRENTLY_BUILDING_COMPONENTS = "demos"
				!include( ../config.pri ) {
				error( "Couldn't find the config.pri file!" )
				}

				TEMPLATE = subdirs
				SUBDIRS += piechartcustomization \
				dynamicspline \
				nesteddonuts \
				qmlchart \
				qmlweather \
				qmlf1legends \
				qmlcustomizations \
				qmlcustommodel \
				chartinteractions \
				qmlaxes \
				qmlcustomlegend \
				callout \
				qmlpolarchart

				contains(QT_CONFIG, opengl) {
				SUBDIRS += chartthemes \
				qmloscilloscope
				} else {
				message("OpenGL not available. Some demos are disabled")
				}

				contains(QT_CONFIG, multimedia) {
				SUBDIRS += audio
				} else {
				message("QtMultimedia library not available. Some demos are disabled")
				}

				contains(QT_VERSION, ^5\\..\\..$):qtHaveModule(quick) {
				SUBDIRS += quick2chart \
				quick2oscilloscope
				}