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

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

Adjust various margins and paddings....
Adjust various margins and paddings. The text items have been changed to use QGraphicsTextItem bounding rects instead of calculating dimensions using QFontMetrics. It seems that QGraphicsTextItem boundingRect involves a lot more of a margin than QFontMetrics provided. To compensate, various margins and paddings have been adjusted lower. Change-Id: Idebf939f5dd804fb96daeaea4bbf1b45f4f02908 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Heikkinen Miikka - - Load All Authors

File last commit:

r2523:abf0d5005e35
r2569:f4eaee212ddc
Show More
tests.pri
34 lines | 1.3 KiB | text/plain | TextLexer
/ tests / tests.pri
History | Annotation | Raw |Copy content |Copy permalink
!include( ../config.pri ) {
error( "Couldn't find the config.pri file!" )
}
TEMPLATE = app
DESTDIR = $$CHART_BUILD_BIN_DIR
OBJECTS_DIR = $$CHART_BUILD_DIR/tests/$$TARGET
MOC_DIR = $$CHART_BUILD_DIR/tests/$$TARGET
UI_DIR = $$CHART_BUILD_DIR/tests/$$TARGET
RCC_DIR = $$CHART_BUILD_DIR/tests/$$TARGET
# staticlib config causes problems when building executables
staticlib: CONFIG-=staticlib
android {
# Workaround to fix android deployment, which seems to always look for target in
# OUT_PWD instead of DESTDIR.
QMAKE_POST_LINK += $$QMAKE_COPY $$CHART_BUILD_BIN_DIR/lib$${TARGET}.so $$OUT_PWD/lib$${TARGET}.so
contains(TARGET, qml.*) {
charts_qmldir.files = $$CHART_BUILD_QML_PLUGIN_DIR/qmldir
charts_qmldir.path = /assets/imports/QtCommercial/Chart
charts_qmlplugin.files = $$CHART_BUILD_QML_PLUGIN_DIR/libqtcommercialchartqml.so
charts_qmlplugin.path = /libs/$$ANDROID_TARGET_ARCH
INSTALLS += charts_qmldir charts_qmlplugin
} else:contains(TARGET, quick2.*) {
charts_qmldir.files = $$CHART_BUILD_QML2_PLUGIN_DIR/qmldir
charts_qmldir.path = /assets/qml/QtCommercial/Chart
charts_qmlplugin.files = $$CHART_BUILD_QML2_PLUGIN_DIR/libqtcommercialchartqml2.so
charts_qmlplugin.path = /libs/$$ANDROID_TARGET_ARCH
INSTALLS += charts_qmldir charts_qmlplugin
}
}