##// END OF EJS Templates
merge fix
merge fix

File last commit:

r349:7594bc4927de
r383:0e6beaefdebb merge
Show More
charts.pro
31 lines | 802 B | text/idl | PrologLexer
Michal Klocek
Add test to common build
r34 !include(common.pri) {
Tero Ahola
Added size factor property to pie
r60 error('missing common.pri')
Michal Klocek
Add test to common build
r34 }
Michal Klocek
Adds examples to common build
r32 TEMPLATE = subdirs
Tero Ahola
Examples, tests and qmlplugin are now built for non-integr. builds
r197 SUBDIRS += src example test qmlplugin
Michal Klocek
Adds private headers handling...
r193
integrated_build:{
Tero Ahola
Examples, tests and qmlplugin are now built for non-integr. builds
r197 message('Configured for integrated build')
} else {
message('Please build example test and qmlplugin after installing library.')
Michal Klocek
Adds private headers handling...
r193 }
Michal Klocek
Adds examples to common build
r32 CONFIG += ordered
QMAKE_CXXFLAGS += -g -Wall
Michal Klocek
Rename QLineChartSeries to QLineSeries
r349 unix:QMAKE_DISTCLEAN += -r build bin include lib doc/html
win32:QMAKE_DISTCLEAN += /Q /s build bin include lib doc\\html
Michal Klocek
Adds examples to common build
r32
# install feature file
feature.path = $$[QT_INSTALL_DATA]/mkspecs/features
feature.files = $$PWD/features/qtcommercialchart.prf
INSTALLS += feature
Michal Klocek
Add "make doc" to build configuration
r306
doc.target = doc
Michal Klocek
make doc config windows friendly
r307 win32:{
doc.commands = qdoc3 $$CHART_BUILD_DOC_DIR\\qcharts.qdocconf
}else{
doc.commands = qdoc3 $$CHART_BUILD_DOC_DIR/qcharts.qdocconf
}
Michal Klocek
Add "make doc" to build configuration
r306 doc.depends = FORCE
QMAKE_EXTRA_TARGETS += doc