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

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

Documentation fixes....
Documentation fixes. Removed empty tutorials tab from docs, to be added later. Fixed broken images in docs, added screenshot of legend.
Tero Ahola - - Load All Authors

File last commit:

r994:96961d029820
r995:d52b7de4b911
Show More
integrated.pri
75 lines | 3.2 KiB | text/plain | TextLexer
/ integrated.pri
History | Source | Raw |Copy content |Copy permalink
Michal Klocek
rename internal -> integrated build
 r43 integrated_build:{
Michal Klocek
Adds private headers handling...
 r193 INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR
Jani Honkonen
Bubblegum fix for vs2010 integrated build
 r130
!win32: {
LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
Michal Klocek
fix integrated build issue
 r177 }else{
Jani Honkonen
Fix integrated build for vs20xx
 r201 win32-msvc*: {
# hack fix for error:
# "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'"
QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR
}else{
LIBS += -L $$CHART_BUILD_LIB_DIR
}
Jani Honkonen
Bubblegum fix for vs2010 integrated build
 r130 }
Michal Klocek
Improved config handling...
 r33 CONFIG(debug, debug|release) {
Tero Ahola
Refactored the test app
 r110 LIBS += -lQtCommercialChartd
#this is ugly hack to work around missing rpath, it simply copies lib
win32:{
copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll
copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChartd.dll $$CHART_BUILD_BIN_DIR
copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChartd.dll
PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll
QMAKE_EXTRA_TARGETS +=copylib
}
Michal Klocek
Add test to common build
 r34 } else {
Tero Ahola
Added size factor property to pie
 r60 LIBS += -lQtCommercialChart
Michal Klocek
Fix compilation config for windows
 r37
Tero Ahola
Added size factor property to pie
 r60 #this is ugly hack to work around missing rpath, it simply copies lib
win32: {
copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChart
copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChart.dll $$CHART_BUILD_BIN_DIR
copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChart.dll
PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChart
QMAKE_EXTRA_TARGETS +=copylib
Michal Klocek
Fix compilation config for windows
 r37 }
Michal Klocek
Add test to common build
 r34 }
Tero Ahola
Hacked integrated builds on OSX to work
 r109
mac: {
Tero Ahola
Fixed integrated build on OSX
 r721 # This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX
Tero Ahola
Make qmlplugin work on OSX integrated build
 r641 CHARTS_LIB_NAME = libQtCommercialChart.1.dylib
CONFIG(debug, debug|release) {
CHARTS_LIB_NAME = libQtCommercialChartd.1.dylib
}
Tero Ahola
Made QmlChart demo instead of a test app
 r922 BIN_TARGET_PATH = ""
Tero Ahola
Fixed integrated build on OSX
 r721 exists ($$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET) {
Tero Ahola
Made QmlChart demo instead of a test app
 r922 BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET
Tero Ahola
Fixed integrated build on OSX
 r721 }
exists ($$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET) {
# Executable in test folder
Tero Ahola
Made QmlChart demo instead of a test app
 r922 BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET
Tero Ahola
Fixed integrated build on OSX
 r721 }
exists ($$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET) {
# Executable in test folder with custom target "tst_NNN"
Tero Ahola
Made QmlChart demo instead of a test app
 r922 BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET
Tero Ahola
Fixed integrated build on OSX
 r721 }
exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") {
# Plugin
Tero Ahola
Made QmlChart demo instead of a test app
 r922 BIN_TARGET_PATH = $$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib"
Tero Ahola
Fixed integrated build on OSX
 r721 }
Tero Ahola
Made QmlChart demo instead of a test app
 r922 !isEmpty (BIN_TARGET_PATH) {
QMAKE_POST_LINK += install_name_tool -change $$CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$CHARTS_LIB_NAME $$BIN_TARGET_PATH
Tero Ahola
Removed unintentional .pro file messages
 r931 # message($$QMAKE_POST_LINK)
Tero Ahola
Modding integrated build for OSX again
 r994 }
# Hack to make qml plugins available as internal build versions
exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") {
QMAKE_POST_LINK += " & $$QMAKE_COPY qmldir $$CHART_BUILD_PLUGIN_DIR"
message($$QMAKE_POST_LINK)
Tero Ahola
Make qmlplugin work on OSX integrated build
 r641 }
Tero Ahola
Hacked integrated builds on OSX to work
 r109 }
Tero Ahola
Added size factor property to pie
 r60 } else {
Tero Ahola
Make qmlplugin work on OSX integrated build
 r641 CONFIG += qtcommercialchart
Michal Klocek
Improved config handling...
 r33 }