##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Added HTML support for various text items...
Added HTML support for various text items - HTML tags can now be used in chart titles, legends, and labels - '\n' does no longer cause line break in multi-line text items. HTML tag <br/> can be used for line break now. - Setting pen for axis titles and labels is deprecated - When setting brush for titles and labels, only the color is relevant - Logic for identifying label format specifiers was improved, so adding additional information to labels via label format string is now more viable. Task-number: QTRD-1912 Change-Id: I8fa56df56fd656e2a3e427eff4abf3481435eec7 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Miikka Heikkinen - - Load All Authors

File last commit:

r2483:f494279b6366
r2539:74f3dbde7a75
Show More
src.pro
256 lines | 8.8 KiB | text/idl | PrologLexer
/ src / src.pro
History | Source | Raw |Copy content |Copy permalink
Marek Rosa
Fixed a typo in auto.pro file
 r1183 !include( ../config.pri ):error( "Couldn't find the config.pri file!" )
Michal Klocek
Simplfies default configuration
 r1021
Michal Klocek
Updates src.pro to make windows copy paths happy
 r1041 ############################# BUILD CONFIG ######################################
Michal Klocek
Simplfies default configuration
 r1021 TARGET = $$LIBRARY_NAME
Michal Klocek
Revert "Integrated scatter series"...
 r39 DESTDIR = $$CHART_BUILD_LIB_DIR
Michal Klocek
fix CRLF in src.pro
 r36 TEMPLATE = lib
Michal Klocek
Simplfies default configuration
 r1021 QT = core gui
Marek Rosa
Qt5: include widgets module
 r2048 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
Michal Klocek
Updates src.pro to make windows copy paths happy
 r1041 DEFINES += QTCOMMERCIALCHART_LIBRARY
Michal Klocek
Another version of src.pro fun
 r1043 win32:CONFIG += create_prl
Michal Klocek
Updates src.pro to make windows copy paths happy
 r1041 # treat warnings as errors
win32-msvc*: {
QMAKE_CXXFLAGS += /WX
} else {
Marek Rosa
Qt5: declarative fix part1...
 r2052 # QMAKE_CXXFLAGS += -Werror
Michal Klocek
Add visiblity compilation flag only on linux
 r1051 }
Miikka Heikkinen
Enable building for qnx on windows...
 r2455 unix:!qnx {
Michal Klocek
Add visiblity compilation flag only on linux
 r1051 QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
Michal Klocek
Updates src.pro to make windows copy paths happy
 r1041 }
############################# DEPEDENCES ########################################
Michal Klocek
Simplfies default configuration
 r1021
Tero Ahola
Adding user32.lib is now Win32/VS specific
 r606 win32-msvc*: LIBS += User32.lib
Michal Klocek
Simplfies default configuration
 r1021 LIBS -= -l$$LIBRARY_NAME
Michal Klocek
Updates src.pro to make windows copy paths happy
 r1041 INCLUDEPATH += ../include .
############################# SOURCES ##########################################
Michal Klocek
Simplfies default configuration
 r1021
Michal Klocek
Move axes files to subdir
 r478 SOURCES += \
Michal Klocek
Adds shadow build support
 r708 $$PWD/chartdataset.cpp \
$$PWD/chartpresenter.cpp \
Michal Klocek
Refactors internals...
 r2273 $$PWD/chartthememanager.cpp \
Michal Klocek
Adds shadow build support
 r708 $$PWD/qchart.cpp \
$$PWD/qchartview.cpp \
Tero Ahola
Renamed QSeries to QAbstractSeries
 r988 $$PWD/qabstractseries.cpp \
Michal Klocek
Adds shadow build support
 r708 $$PWD/chartbackground.cpp \
Michal Klocek
Refactors Chart to ChartElement
 r1736 $$PWD/chartelement.cpp \
Michal Klocek
Refactors internals...
 r2273 $$PWD/chartitem.cpp \
Michal Klocek
Refactors layout managment...
 r1534 $$PWD/scroller.cpp \
Miikka Heikkinen
Add Polar chart support...
 r2483 $$PWD/charttitle.cpp \
$$PWD/qpolarchart.cpp
Michal Klocek
Move axes files to subdir
 r478 PRIVATE_HEADERS += \
Michal Klocek
Adds shadow build support
 r708 $$PWD/chartdataset_p.h \
$$PWD/chartitem_p.h \
$$PWD/chartpresenter_p.h \
Michal Klocek
Refactors internals...
 r2273 $$PWD/chartthememanager_p.h \
Michal Klocek
Adds shadow build support
 r708 $$PWD/chartbackground_p.h \
Michal Klocek
Refactors Chart to ChartElement
 r1736 $$PWD/chartelement_p.h \
Michal Klocek
Adds PIMPL to qchart
 r740 $$PWD/chartconfig_p.h \
Michal Klocek
adds QChartView PIMPL, refactor public API
 r746 $$PWD/qchart_p.h \
Michal Klocek
Refactor qledgend handling...
 r855 $$PWD/qchartview_p.h \
Michal Klocek
Adds big fat pimpl to series classes...
 r938 $$PWD/scroller_p.h \
Michal Klocek
Refactors layout managment...
 r1534 $$PWD/qabstractseries_p.h \
Mika Salmela
Fix to discard NaN, Inf and -Inf values from chart....
 r2424 $$PWD/charttitle_p.h \
$$PWD/charthelpers_p.h
sauimone
Separated legend marker to private header. Added signals for left and right mouse click
 r547 PUBLIC_HEADERS += \
Michal Klocek
Adds shadow build support
 r708 $$PWD/qchart.h \
$$PWD/qchartglobal.h \
Tero Ahola
Renamed QSeries to QAbstractSeries
 r988 $$PWD/qabstractseries.h \
Marek Rosa
Using namespace macro is now added to ui_*.h files when using designer plugin
 r1750 $$PWD/qchartview.h \
Miikka Heikkinen
Add Polar chart support...
 r2483 $$PWD/chartsnamespace.h \
$$PWD/qpolarchart.h
Michal Klocek
Animation refactor...
 r530
Michal Klocek
Moves legend src to subdirectory
 r957 include(animations/animations.pri)
include(areachart/areachart.pri)
Michal Klocek
Move axes files to subdir
 r478 include(axis/axis.pri)
Marek Rosa
Domains added
 r2275 include(domain/domain.pri)
Michal Klocek
Rename QChartSeries to QSeries
 r360 include(barchart/barchart.pri)
Michal Klocek
Moves legend src to subdirectory
 r957 include(legend/legend.pri)
include(linechart/linechart.pri)
Jani Honkonen
Moved pie stuff to own .pri file and rename stuff
 r146 include(piechart/piechart.pri)
Michal Klocek
Adds converage support to pro files, renames scatterseries -> scatterchart
 r1084 include(scatterchart/scatter.pri)
Marek Rosa
Spline initial
 r295 include(splinechart/splinechart.pri)
Michal Klocek
Adds shadow build support
 r708 include(themes/themes.pri)
Michal Klocek
Moves legend src to subdirectory
 r957 include(xychart/xychart.pri)
Miikka Heikkinen
Add Polar chart support...
 r2483 include(layout/layout.pri)
Tero Ahola
New theme with light colors, chartview background
 r584
Tero Ahola
Moved scatter impl into a subfolder
 r194 HEADERS += $$PUBLIC_HEADERS
Michal Klocek
fix CRLF in src.pro
 r36 HEADERS += $$PRIVATE_HEADERS
Michal Klocek
Refactor themes...
 r143 HEADERS += $$THEMES
Michal Klocek
Updates src.pro to make windows copy paths happy
 r1041
############################# BUILD PATH ##########################################
Michal Klocek
Adds PIMPL to qchart
 r740
Michal Klocek
Revert "Integrated scatter series"...
 r39 OBJECTS_DIR = $$CHART_BUILD_DIR/lib
MOC_DIR = $$CHART_BUILD_DIR/lib
UI_DIR = $$CHART_BUILD_DIR/lib
RCC_DIR = $$CHART_BUILD_DIR/lib
Michal Klocek
Adds qt headers generation to build config
 r588
Jani Honkonen
removed some of the todo comments
 r1896 ############################# PUBLIC HEADERS GENERATOR ##########################################
Michal Klocek
Updates src.pro to make windows copy paths happy
 r1041
Michal Klocek
Chages 'find' to 'contains' in src.pro to make windows linux build the same
 r711 !exists($$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal)
Michal Klocek
Fix missig include dir form src.pro
 r591 {
Michal Klocek
minor. comments in src.pro
 r603 system($$QMAKE_MKDIR $$CHART_BUILD_PUBLIC_HEADER_DIR)
Miikka Heikkinen
Enable building for qnx on windows...
 r2455 contains(QMAKE_HOST.os, Windows) {
Michal Klocek
Chages 'find' to 'contains' in src.pro to make windows linux build the same
 r711 command = "echo $${LITERAL_HASH}include \"qchartglobal.h\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal"
}else{
command = "echo \"$${LITERAL_HASH}include \\\"qchartglobal.h\\\"\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal"
}
Michal Klocek
Improves build configuration...
 r996 PUBLIC_QT_HEADERS += $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal
Michal Klocek
Chages 'find' to 'contains' in src.pro to make windows linux build the same
 r711 system($$command)
Michal Klocek
Fix missig include dir form src.pro
 r591 }
Michal Klocek
Adds qt headers generation to build config
 r588 for(file, PUBLIC_HEADERS) {
name = $$split(file,'/')
name = $$last(name)
class = "$$cat($$file)"
class = $$find(class,class)
!isEmpty(class){
class = $$split(class,QTCOMMERCIALCHART_EXPORT)
class = $$member(class,1)
Michal Klocek
minor. change in regpattern in src.pro
 r589 class = $$split(class,' ')
Michal Klocek
Adds qt headers generation to build config
 r588 class = $$replace(class,' ','')
class = $$member(class,0)
Miikka Heikkinen
Enable building for qnx on windows...
 r2455 contains(QMAKE_HOST.os, Windows) {
Michal Klocek
Adds win32 command condition to src.pro
 r627 command = "echo $${LITERAL_HASH}include \"$$name\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class"
}else{
command = "echo \"$${LITERAL_HASH}include \\\"$$name\\\"\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class"
}
Michal Klocek
Adds qt headers generation to build config
 r588 PUBLIC_QT_HEADERS += $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class
Michal Klocek
Fix missig include dir form src.pro
 r591 system($$command)
Michal Klocek
Adds qt headers generation to build config
 r588 }
}
Michal Klocek
Updates src.pro to make windows copy paths happy
 r1041 ############################# INSTALLERS ##########################################
Michal Klocek
fix CRLF in src.pro
 r36 public_headers.path = $$[QT_INSTALL_HEADERS]/QtCommercialChart
Michal Klocek
Adds qt headers generation to build config
 r588 public_headers.files = $$PUBLIC_HEADERS $$PUBLIC_QT_HEADERS
Michal Klocek
Updates src.pro to make windows copy paths happy
 r1041 INSTALLS += public_headers
Michal Klocek
Adds qt headers generation to build config
 r588
install_build_public_headers.name = build_public_headers
Michal Klocek
Adds private headers handling...
 r193 install_build_public_headers.output = $$CHART_BUILD_PUBLIC_HEADER_DIR/${QMAKE_FILE_BASE}.h
install_build_public_headers.input = PUBLIC_HEADERS
install_build_public_headers.commands = $$QMAKE_COPY \
Michal Klocek
Fix previous broken commit
 r145 ${QMAKE_FILE_NAME} \
Michal Klocek
Adds private headers handling...
 r193 $$CHART_BUILD_PUBLIC_HEADER_DIR
install_build_public_headers.CONFIG += target_predeps \
Michal Klocek
Fix previous broken commit
 r145 no_link
Michal Klocek
Adds qt headers generation to build config
 r588
Michal Klocek
minor typo in src.pro
 r1766 install_build_private_headers.name = build_private_headers
Michal Klocek
Adds private headers handling...
 r193 install_build_private_headers.output = $$CHART_BUILD_PRIVATE_HEADER_DIR/${QMAKE_FILE_BASE}.h
install_build_private_headers.input = PRIVATE_HEADERS
install_build_private_headers.commands = $$QMAKE_COPY \
${QMAKE_FILE_NAME} \
$$CHART_BUILD_PRIVATE_HEADER_DIR
install_build_private_headers.CONFIG += target_predeps \
no_link
Michal Klocek
Adds qt headers generation to build config
 r588
Michal Klocek
Rename QChartSeries to QSeries
 r360 QMAKE_EXTRA_COMPILERS += install_build_public_headers \
Michal Klocek
Adds qt headers generation to build config
 r588 install_build_private_headers \
Michal Klocek
Updates src.pro to make windows copy paths happy
 r1041
win32:{
Jani Honkonen
Fix copy errors when running install in windows
 r1047 bintarget.CONFIG += no_check_exist
Jani Honkonen
Adding support for static builds.
 r1440 !staticlib: {
bintarget.files += $$CHART_BUILD_LIB_DIR\\$${TARGET}.dll
}
Jani Honkonen
Fix copy errors when running install in windows
 r1047 win32-msvc*:CONFIG(debug, debug|release): {
Michal Klocek
Fix removing all SDK bug
 r1214 bintarget.files += $$CHART_BUILD_LIB_DIR\\$${TARGET}.pdb
Jani Honkonen
Fix copy errors when running install in windows
 r1047 }
Michal Klocek
Another version of scr.pro stuff
 r1044 bintarget.path = $$[QT_INSTALL_BINS]
Jani Honkonen
Fix copy errors when running install in windows
 r1047
libtarget.CONFIG += no_check_exist
Michal Klocek
Fix removing all SDK bug
 r1214 libtarget.files = $$CHART_BUILD_LIB_DIR\\$${TARGET}.prl
Jani Honkonen
Fix copy errors when running install in windows
 r1047 win32-msvc*: {
Michal Klocek
Fix removing all SDK bug
 r1214 libtarget.files += $$CHART_BUILD_LIB_DIR\\$${TARGET}.lib
Jani Honkonen
Fix copy errors when running install in windows
 r1047 } else {
Michal Klocek
Fix removing all SDK bug
 r1214 libtarget.files += $$CHART_BUILD_LIB_DIR\\lib$${TARGET}.a
Jani Honkonen
Fix copy errors when running install in windows
 r1047 }
Michal Klocek
Another version of scr.pro stuff
 r1044 libtarget.path = $$[QT_INSTALL_LIBS]
Jani Honkonen
Fix copy errors when running install in windows
 r1047
Michal Klocek
Updates src.pro to make windows copy paths happy
 r1041 DLLDESTDIR = $$CHART_BUILD_BIN_DIR
Michal Klocek
Another version of scr.pro stuff
 r1044 INSTALLS += bintarget libtarget
}else{
target.path=$$[QT_INSTALL_LIBS]
INSTALLS += target
}
Tero Ahola
OSX install name tool now executed only on QtCommercialChart library during build
 r1419
Tero Ahola
Fixed staticlib build on OSX
 r1442 mac: !staticlib: {
Tero Ahola
Fix name (id) of the installed library on OSX
 r1421 # Update the name (id) of the library on OSX to point to the lib path
Tero Ahola
OSX install name tool now executed only on QtCommercialChart library during build
 r1419 MAC_CHARTS_LIB_NAME = "lib"$$LIBRARY_NAME".1.dylib"
QMAKE_POST_LINK += "install_name_tool -id $$CHART_BUILD_LIB_DIR"/"$$MAC_CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$MAC_CHARTS_LIB_NAME"
Tero Ahola
Fix name (id) of the installed library on OSX
 r1421
# Update the name (id) of the installed library on OSX to point to the installation path
postinstall.path = $$[QT_INSTALL_LIBS]
postinstall.extra = "install_name_tool -id $$[QT_INSTALL_LIBS]"/"$$MAC_CHARTS_LIB_NAME $$[QT_INSTALL_LIBS]"/"$$MAC_CHARTS_LIB_NAME"
INSTALLS += postinstall
Tero Ahola
OSX install name tool now executed only on QtCommercialChart library during build
 r1419 }
Michal Klocek
Updates src.pro to make windows copy paths happy
 r1041 ################################ DEVELOPMENT BUILD ##########################################
Michal Klocek
Improves build configuration...
 r996 # There is a problem with jom.exe currently. It does not seem to understand QMAKE_EXTRA_TARGETS properly.
# This is the case at least with shadow builds.
# http://qt-project.org/wiki/jom
Michal Klocek
Add build stamp and git head support for debug
 r715
Michal Klocek
Updates development_build option
 r998 development_build:!win32-msvc*:{
Jani Honkonen
Fix shadow build/jom.exe problems
 r808 chartversion.target = $$PWD/qchartversion_p.h
unix:{
chartversion.commands = @echo \
Michal Klocek
Improves build configuration...
 r996 \" $${LITERAL_HASH}ifndef QCHARTVERSION_P_H\\n\
$${LITERAL_HASH}define QCHARTVERSION_P_H\\n\
const char *buildTime = \\\"`date +'%y%m%d%H%M'`\\\" ; \\n\
const char *gitHead = \\\"`git rev-parse HEAD`\\\" ; \\n \
$${LITERAL_HASH}endif \" \
Jani Honkonen
Fix shadow build/jom.exe problems
 r808 > \
$$chartversion.target;
}else{
chartversion.commands = @echo \
"const char *buildTime = \"%date%_%time%\" ; \
const char *gitHead = \"unknown\" ; " \
> \
$$chartversion.target
}
chartversion.depends = $$HEADERS \
$$SOURCES
Michal Klocek
Improves build configuration...
 r996 PRE_TARGETDEPS += $$chartversion.target
Jani Honkonen
Fix shadow build/jom.exe problems
 r808 QMAKE_CLEAN += $$PWD/qchartversion_p.h
QMAKE_EXTRA_TARGETS += chartversion
Michal Klocek
Add build stamp and git head support for debug
 r715 }
Jani Honkonen
Fix shadow build/jom.exe problems
 r808
Michal Klocek
Updates src.pro to make windows copy paths happy
 r1041 ############################### CLEAN ###########################################
Michal Klocek
Fix previous broken commit
 r145 unix:QMAKE_DISTCLEAN += -r \
$$CHART_BUILD_HEADER_DIR \
$$CHART_BUILD_LIB_DIR
win32:QMAKE_DISTCLEAN += /Q \
$$CHART_BUILD_HEADER_DIR \
$$CHART_BUILD_LIB_DIR
Michal Klocek
Adds qt headers generation to build config
 r588
Michal Klocek
Adds converage support to pro files, renames scatterseries -> scatterchart
 r1084 ############################## COVERAGE #########################################
Michal Klocek
minor. add debug flag for coverage
 r1087 unix:coverage:{
Michal Klocek
Adds converage support to pro files, renames scatterseries -> scatterchart
 r1084
QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
QMAKE_LDFLAGS += -fprofile-arcs -ftest-coverage
LIBS += -lgcov
QMAKE_CLEAN += $$OBJECTS_DIR/*.gcda $$OBJECTS_DIR/*.gcno $$PWD/*.gcov ../coverage/*.info
QMAKE_EXTRA_TARGETS += preparecoverage gencoverage
preparecoverage.target = prepare_coverage
preparecoverage.depends = all
preparecoverage.commands = lcov --directory $$OBJECTS_DIR --zerocounters ;\
lcov -i -d $$OBJECTS_DIR -c -o ../coverage/base.info -b $$PWD;
gencoverage.target = gen_coverage
gencoverage.depends = all
gencoverage.commands = lcov -d $$OBJECTS_DIR -c -o ../coverage/src.info -b $$PWD;\
lcov -e ../coverage/base.info $$PWD/* $$PWD/animations/* $$PWD/areachart/* $$PWD/axis/* $$PWD/barchart/* $$PWD/legend/* $$PWD/linechart/* $$PWD/piechart/* $$PWD/scatterchart/* $$PWD/splinechart/* $$PWD/themes/* $$PWD/xychart/* -o ../coverage/base.info;\
lcov -e ../coverage/src.info $$PWD/* $$PWD/animations/* $$PWD/areachart/* $$PWD/axis/* $$PWD/barchart/* $$PWD/legend/* $$PWD/linechart/* $$PWD/piechart/* $$PWD/scatterchart/* $$PWD/splinechart/* $$PWD/themes/* $$PWD/xychart/* -o ../coverage/src.info;\
lcov -a ../coverage/base.info -a ../coverage/src.info -o ../coverage/coverage.info;
}