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

Merge remote-tracking branch 'origin/5.6' into 5.7...

Merge remote-tracking branch 'origin/5.6' into 5.7 Conflicts: src/charts/charts.pro src/charts/qchartglobal.h src/chartsqml2/chartsqml2.pro tests/auto/chartdataset/tst_chartdataset.cpp tests/auto/domain/tst_domain.cpp Change-Id: I9bfc63f6e93f9a3b86e53aca218dd3a48bb2ffc1

Liang Qi - - Load All Authors

File last commit:

r2898:03a6177a3223 master


                r2898:03a6177a3223

master

Download file

             chartsqml2.pro
        
                    53 lines
            
             | 1.3 KiB
            
                | text/idl
            
             |
                PrologLexer
            
             / src / chartsqml2 / chartsqml2.pro
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      TARGET = qtchartsqml2

        Oswald Buddenhagen
    
set up relation with c++ module correctly....

              r2888
            
      CXX_MODULE = charts

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT += qml quick

        Titta Heikkala
    
Fix include syntax...

              r2714
            
      QT += charts charts-private

        Miikka Heikkinen
    
No longer automatically disable QDateTimeAxis on ARM platforms...

              r2861
            
      contains(QT_COORD_TYPE, float): DEFINES += QT_QREAL_IS_FLOAT

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
        Titta Heikkala
    
Add QML designer plugin...

              r2738
            
      include($$PWD/designer/designer.pri)

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      SOURCES += \

          chartsqml2_plugin.cpp \

          declarativechart.cpp \

          declarativexypoint.cpp \

          declarativexyseries.cpp \

          declarativelineseries.cpp \

          declarativesplineseries.cpp \

          declarativeareaseries.cpp \

          declarativescatterseries.cpp \

          declarativepieseries.cpp \

          declarativebarseries.cpp \

          declarativecategoryaxis.cpp \

          declarativemargins.cpp \

          declarativeaxes.cpp \

          declarativepolarchart.cpp \

        Miikka Heikkinen
    
Accelerating lineseries with OpenGL...

              r2820
            
          declarativeboxplotseries.cpp \

          declarativechartnode.cpp \

          declarativerendernode.cpp

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      HEADERS += \

          declarativechart.h \

          declarativexypoint.h \

          declarativexyseries.h \

          declarativelineseries.h \

          declarativesplineseries.h \

          declarativeareaseries.h \

          declarativescatterseries.h \

          declarativepieseries.h \

          declarativebarseries.h \

          declarativecategoryaxis.h \

          declarativemargins.h \

          declarativeaxes.h \

          declarativepolarchart.h \

        Miikka Heikkinen
    
Accelerating lineseries with OpenGL...

              r2820
            
          declarativeboxplotseries.h \

          declarativechartnode.h \

          declarativerendernode.h

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      load(qml_plugin)

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

              r2809
            
      win32 {

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

          QMAKE_TARGET_DESCRIPTION = "Charts QML plugin for Qt."

      }

	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
		TARGET = qtchartsqml2
Oswald Buddenhagen set up relation with c++ module correctly....	r2888	CXX_MODULE = charts

Titta Heikkala Qt Charts project file structure change...	r2712	QT += qml quick
Titta Heikkala Fix include syntax...	r2714	QT += charts charts-private
Miikka Heikkinen No longer automatically disable QDateTimeAxis on ARM platforms...	r2861	contains(QT_COORD_TYPE, float): DEFINES += QT_QREAL_IS_FLOAT
Titta Heikkala Qt Charts project file structure change...	r2712
Titta Heikkala Add QML designer plugin...	r2738	include($$PWD/designer/designer.pri)

Titta Heikkala Qt Charts project file structure change...	r2712	SOURCES += \
		chartsqml2_plugin.cpp \
		declarativechart.cpp \
		declarativexypoint.cpp \
		declarativexyseries.cpp \
		declarativelineseries.cpp \
		declarativesplineseries.cpp \
		declarativeareaseries.cpp \
		declarativescatterseries.cpp \
		declarativepieseries.cpp \
		declarativebarseries.cpp \
		declarativecategoryaxis.cpp \
		declarativemargins.cpp \
		declarativeaxes.cpp \
		declarativepolarchart.cpp \
Miikka Heikkinen Accelerating lineseries with OpenGL...	r2820	declarativeboxplotseries.cpp \
		declarativechartnode.cpp \
		declarativerendernode.cpp
Titta Heikkala Qt Charts project file structure change...	r2712
		HEADERS += \
		declarativechart.h \
		declarativexypoint.h \
		declarativexyseries.h \
		declarativelineseries.h \
		declarativesplineseries.h \
		declarativeareaseries.h \
		declarativescatterseries.h \
		declarativepieseries.h \
		declarativebarseries.h \
		declarativecategoryaxis.h \
		declarativemargins.h \
		declarativeaxes.h \
		declarativepolarchart.h \
Miikka Heikkinen Accelerating lineseries with OpenGL...	r2820	declarativeboxplotseries.h \
		declarativechartnode.h \
		declarativerendernode.h
Titta Heikkala Qt Charts project file structure change...	r2712
		load(qml_plugin)

Antti Kokko Correct file version, description, and product name for Qt Charts...	r2809	win32 {
		QMAKE_TARGET_PRODUCT = "Qt Charts (Qt $$QT_VERSION)"
		QMAKE_TARGET_DESCRIPTION = "Charts QML plugin for Qt."
		}