HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/charts/charts.pro

Change the opengl widget to be child of the first view of the scene...

Change the opengl widget to be child of the first view of the scene Scene itself doesn't necessarily have a parent, so the old way didn't always find a parent for opengl widget. Change-Id: I60053b94a5979f4142cc3f720f48e38cc7c8d440 Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>

Miikka Heikkinen - - Load All Authors

File last commit:

r2820:79a856530b69


                r2841:3448d86fc598

Download file

             charts.pro
        
                    101 lines
            
             | 2.6 KiB
            
                | text/idl
            
             |
                PrologLexer
            
             / src / charts / charts.pro
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      ############################# BUILD CONFIG ######################################

      TARGET = QtCharts

      message($$QT_CONFIG)

      QT = core gui widgets

      DEFINES += QT_CHARTS_LIBRARY

      # Fix exports in static builds for applications linking charts module

      static: MODULE_DEFINES += QT_CHARTS_STATICLIB

      MODULE_INCNAME = QtCharts

      QMAKE_DOCS = $$PWD/doc/qtcharts.qdocconf

      load(qt_module)

        Antti Kokko
    
Correct file version, description, and product name for Qt Charts...

              r2809
            
      QMAKE_TARGET_PRODUCT = "Qt Charts (Qt $$QT_VERSION)"

      QMAKE_TARGET_DESCRIPTION = "Charts component for Qt."

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      ############################# SOURCES ##########################################

      SOURCES += \

          $$PWD/chartdataset.cpp \

          $$PWD/chartpresenter.cpp \

          $$PWD/chartthememanager.cpp \

          $$PWD/qchart.cpp \

          $$PWD/qchartview.cpp \

          $$PWD/qabstractseries.cpp \

          $$PWD/chartbackground.cpp \

          $$PWD/chartelement.cpp \

          $$PWD/chartitem.cpp \

          $$PWD/scroller.cpp \

          $$PWD/charttitle.cpp \

          $$PWD/qpolarchart.cpp

        Miikka Heikkinen
    
Accelerating lineseries with OpenGL...

              r2820
            
      contains(QT_CONFIG, opengl): SOURCES += $$PWD/glwidget.cpp

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      PRIVATE_HEADERS += \

          $$PWD/chartdataset_p.h \

          $$PWD/chartitem_p.h \

          $$PWD/chartpresenter_p.h \

          $$PWD/chartthememanager_p.h \

          $$PWD/chartbackground_p.h \

          $$PWD/chartelement_p.h \

          $$PWD/chartconfig_p.h \

          $$PWD/qchart_p.h \

          $$PWD/qchartview_p.h \

          $$PWD/scroller_p.h \

          $$PWD/qabstractseries_p.h \

          $$PWD/charttitle_p.h \

          $$PWD/charthelpers_p.h

        Miikka Heikkinen
    
Accelerating lineseries with OpenGL...

              r2820
            
      contains(QT_CONFIG, opengl): PRIVATE_HEADERS += $$PWD/glwidget_p.h

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      PUBLIC_HEADERS += \

          $$PWD/qchart.h \

          $$PWD/qchartglobal.h \

          $$PWD/qabstractseries.h \

          $$PWD/qchartview.h \

          $$PWD/chartsnamespace.h \

          $$PWD/qpolarchart.h

      include($$PWD/common.pri)

      include($$PWD/animations/animations.pri)

      include($$PWD/areachart/areachart.pri)

      include($$PWD/axis/axis.pri)

      include($$PWD/domain/domain.pri)

      include($$PWD/barchart/barchart.pri)

      include($$PWD/legend/legend.pri)

      include($$PWD/linechart/linechart.pri)

      include($$PWD/piechart/piechart.pri)

      include($$PWD/scatterchart/scatter.pri)

      include($$PWD/splinechart/splinechart.pri)

      include($$PWD/themes/themes.pri)

      include($$PWD/xychart/xychart.pri)

      include($$PWD/layout/layout.pri)

      include($$PWD/boxplotchart/boxplotchart.pri)

      HEADERS += $$PUBLIC_HEADERS

      HEADERS += $$PRIVATE_HEADERS

      HEADERS += $$THEMES

      OTHER_FILES += doc/qtcharts.qdocconf \

                     doc/src/* \

                     doc/images/*

      #Define for unit tests

      CONFIG(debug, debug|release) {

          DEFINES += BUILD_PRIVATE_UNIT_TESTS

      }

        Miikka Heikkinen
    
Suppress a warning in msvc 64bit builds...

              r2713
            
      msvc {

          # Suppress "conversion from 'size_t' to 'int', possible loss of data" warnings in 64bit

          # builds resulting from usage of str::sort

          QMAKE_CXXFLAGS_WARN_ON += -wd4267

      }

        Miikka Heikkinen
    
Fix build issue with dynamic OpenGL configurations...

              r2736
            
        Miikka Heikkinen
    
Fix mingw builds....

              r2737
            
      win32:!winrt:!wince {

        Miikka Heikkinen
    
Fix build issue with dynamic OpenGL configurations...

              r2736
            
          # ChartThemeSystem uses Windows native API

        Miikka Heikkinen
    
Fix mingw builds....

              r2737
            
          LIBS += -luser32

        Miikka Heikkinen
    
Fix build issue with dynamic OpenGL configurations...

              r2736
            
      }

	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

Titta Heikkala Qt Charts project file structure change...	r2712	############################# BUILD CONFIG ######################################

		TARGET = QtCharts

		message($$QT_CONFIG)
		QT = core gui widgets
		DEFINES += QT_CHARTS_LIBRARY
		# Fix exports in static builds for applications linking charts module
		static: MODULE_DEFINES += QT_CHARTS_STATICLIB

		MODULE_INCNAME = QtCharts

		QMAKE_DOCS = $$PWD/doc/qtcharts.qdocconf

		load(qt_module)

Antti Kokko Correct file version, description, and product name for Qt Charts...	r2809	QMAKE_TARGET_PRODUCT = "Qt Charts (Qt $$QT_VERSION)"
		QMAKE_TARGET_DESCRIPTION = "Charts component for Qt."

Titta Heikkala Qt Charts project file structure change...	r2712	############################# SOURCES ##########################################

		SOURCES += \
		$$PWD/chartdataset.cpp \
		$$PWD/chartpresenter.cpp \
		$$PWD/chartthememanager.cpp \
		$$PWD/qchart.cpp \
		$$PWD/qchartview.cpp \
		$$PWD/qabstractseries.cpp \
		$$PWD/chartbackground.cpp \
		$$PWD/chartelement.cpp \
		$$PWD/chartitem.cpp \
		$$PWD/scroller.cpp \
		$$PWD/charttitle.cpp \
		$$PWD/qpolarchart.cpp
Miikka Heikkinen Accelerating lineseries with OpenGL...	r2820
		contains(QT_CONFIG, opengl): SOURCES += $$PWD/glwidget.cpp

Titta Heikkala Qt Charts project file structure change...	r2712	PRIVATE_HEADERS += \
		$$PWD/chartdataset_p.h \
		$$PWD/chartitem_p.h \
		$$PWD/chartpresenter_p.h \
		$$PWD/chartthememanager_p.h \
		$$PWD/chartbackground_p.h \
		$$PWD/chartelement_p.h \
		$$PWD/chartconfig_p.h \
		$$PWD/qchart_p.h \
		$$PWD/qchartview_p.h \
		$$PWD/scroller_p.h \
		$$PWD/qabstractseries_p.h \
		$$PWD/charttitle_p.h \
		$$PWD/charthelpers_p.h
Miikka Heikkinen Accelerating lineseries with OpenGL...	r2820
		contains(QT_CONFIG, opengl): PRIVATE_HEADERS += $$PWD/glwidget_p.h

Titta Heikkala Qt Charts project file structure change...	r2712	PUBLIC_HEADERS += \
		$$PWD/qchart.h \
		$$PWD/qchartglobal.h \
		$$PWD/qabstractseries.h \
		$$PWD/qchartview.h \
		$$PWD/chartsnamespace.h \
		$$PWD/qpolarchart.h

		include($$PWD/common.pri)
		include($$PWD/animations/animations.pri)
		include($$PWD/areachart/areachart.pri)
		include($$PWD/axis/axis.pri)
		include($$PWD/domain/domain.pri)
		include($$PWD/barchart/barchart.pri)
		include($$PWD/legend/legend.pri)
		include($$PWD/linechart/linechart.pri)
		include($$PWD/piechart/piechart.pri)
		include($$PWD/scatterchart/scatter.pri)
		include($$PWD/splinechart/splinechart.pri)
		include($$PWD/themes/themes.pri)
		include($$PWD/xychart/xychart.pri)
		include($$PWD/layout/layout.pri)
		include($$PWD/boxplotchart/boxplotchart.pri)

		HEADERS += $$PUBLIC_HEADERS
		HEADERS += $$PRIVATE_HEADERS
		HEADERS += $$THEMES

		OTHER_FILES += doc/qtcharts.qdocconf \
		doc/src/* \
		doc/images/*

		#Define for unit tests
		CONFIG(debug, debug\|release) {
		DEFINES += BUILD_PRIVATE_UNIT_TESTS
		}
Miikka Heikkinen Suppress a warning in msvc 64bit builds...	r2713
		msvc {
		# Suppress "conversion from 'size_t' to 'int', possible loss of data" warnings in 64bit
		# builds resulting from usage of str::sort
		QMAKE_CXXFLAGS_WARN_ON += -wd4267
		}
Miikka Heikkinen Fix build issue with dynamic OpenGL configurations...	r2736
Miikka Heikkinen Fix mingw builds....	r2737	win32:!winrt:!wince {
Miikka Heikkinen Fix build issue with dynamic OpenGL configurations...	r2736	# ChartThemeSystem uses Windows native API
Miikka Heikkinen Fix mingw builds....	r2737	LIBS += -luser32
Miikka Heikkinen Fix build issue with dynamic OpenGL configurations...	r2736	}