Skip to content

Commit 1b0a804

Browse files
furszyfurszy
committed
qtcharts lib integrated.
1 parent 81d5a72 commit 1b0a804

File tree

4 files changed

+24
-8
lines changed

4 files changed

+24
-8
lines changed

‎build-aux/m4/bitcoin_qt.m4‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,15 +464,16 @@ AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITHOUT_PKGCONFIG],[
464464
TEMP_LIBS="$LIBS"
465465
BITCOIN_QT_CHECK([
466466
if test "x$qt_include_path" != x; then
467-
QT_INCLUDES="-I$qt_include_path -I$qt_include_path/QtCore -I$qt_include_path/QtGui -I$qt_include_path/QtWidgets -I$qt_include_path/QtNetwork -I$qt_include_path/QtTest -I$qt_include_path/QtDBus -I$qt_include_path/QtSvg"
467+
QT_INCLUDES="-I$qt_include_path -I$qt_include_path/QtCore -I$qt_include_path/QtGui -I$qt_include_path/QtWidgets -I$qt_include_path/QtNetwork -I$qt_include_path/QtTest -I$qt_include_path/QtDBus -I$qt_include_path/QtSvg -I$qt_include_path/QtCharts"
468468
CPPFLAGS="$QT_INCLUDES $CPPFLAGS"
469469
fi
470470
])
471471
472472
BITCOIN_QT_CHECK([AC_CHECK_HEADER([QtPlugin],,BITCOIN_QT_FAIL(QtCore headers missing))])
473473
BITCOIN_QT_CHECK([AC_CHECK_HEADER([QApplication],, BITCOIN_QT_FAIL(QtGui headers missing))])
474474
BITCOIN_QT_CHECK([AC_CHECK_HEADER([QLocalSocket],, BITCOIN_QT_FAIL(QtNetwork headers missing))])
475-
BITCOIN_QT_CHECK([AC_CHECK_HEADER([QtSvg],, BITCOIN_QT_FAIL(QtSVG headers missing))])
475+
BITCOIN_QT_CHECK([AC_CHECK_HEADER([QtSvg],, BITCOIN_QT_FAIL(QtSvg headers missing))])
476+
BITCOIN_QT_CHECK([AC_CHECK_HEADER([QtCharts],, BITCOIN_QT_FAIL(QtCharts headers missing))])
476477
477478
BITCOIN_QT_CHECK([
478479
if test "x$bitcoin_qt_want_version" = xauto; then

‎configure.ac‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,6 +1028,7 @@ if test x$use_pkgconfig = xyes; then
10281028
BITCOIN_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode], [have_qrencode=yes], [have_qrencode=no])])
10291029
fi
10301030
BITCOIN_QT_CHECK([PKG_CHECK_MODULES([SVG], [Qt5Svg],,[BITCOIN_QT_FAIL(qtsvg not found)])])
1031+
BITCOIN_QT_CHECK([PKG_CHECK_MODULES([CHARTS], [Qt5Charts],,[BITCOIN_QT_FAIL(qtcharts not found)])])
10311032
if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then
10321033
PKG_CHECK_MODULES([EVENT], [libevent],, [AC_MSG_ERROR(libevent not found.)])
10331034
if test x$TARGET_OS != xwindows; then
@@ -1086,6 +1087,7 @@ else
10861087

10871088
BITCOIN_QT_CHECK(AC_CHECK_LIB([protobuf] ,[main],[PROTOBUF_LIBS=-lprotobuf], BITCOIN_QT_FAIL(libprotobuf not found)))
10881089
BITCOIN_QT_CHECK([AC_CHECK_LIB([Qt5Svg], [main],[SVG_LIBS=-lQt5Svg], BITCOIN_QT_FAIL(svg not found))])
1090+
BITCOIN_QT_CHECK([AC_CHECK_LIB([Qt5Charts], [main],[SVG_LIBS=-lQt5Charts], BITCOIN_QT_FAIL(charts not found))])
10891091
BITCOIN_QT_CHECK([AC_CHECK_HEADER([qsvgwidget.h],, BITCOIN_QT_FAIL(svg not found))])
10901092
if test x$use_qr != xno; then
10911093
BITCOIN_QT_CHECK([AC_CHECK_LIB([qrencode], [main],[QR_LIBS=-lqrencode], [have_qrencode=no])])
@@ -1499,4 +1501,6 @@ echo " PIC_FLAGS = $PIC_FLAGS"
14991501
echo " QT_PIE_FLAGS = $QT_PIE_FLAGS"
15001502
echo " SVG_LIBS = $SVG_LIBS "
15011503
echo " SVG_CFLAGS = $SVG_CFLAGS "
1504+
echo " CHARTS_LIBS = $CHARTS_LIBS "
1505+
echo " CHARTS_CFLAGS = $CHARTS_CFLAGS "
15021506
echo

‎depends/packages/qt.mk‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,13 @@ $(package)_qttools_sha256_hash=d62e0f70d99645d6704dbb8976fb2222443061743689943d4
1919
$(package)_qtsvg_file_name=qtsvg-$($(package)_suffix)
2020
$(package)_qtsvg_sha256_hash=628f22b8472e96ed8033d5491286ce2ab5b2c7b9fe0fe468acd78b458dc75564
2121

22+
$(package)_qtcharts_file_name=qtcharts-$($(package)_suffix)
23+
$(package)_qtcharts_sha256_hash=16cd367241b2e0cd3bc8aea6f874598cd18ad83b72eed89f2713b777272572e6
24+
2225
$(package)_extra_sources = $($(package)_qttranslations_file_name)
2326
$(package)_extra_sources += $($(package)_qttools_file_name)
2427
$(package)_extra_sources += $($(package)_qtsvg_file_name)
28+
$(package)_extra_sources += $($(package)_qtcharts_file_name)
2529

2630
define $(package)_set_vars
2731
$(package)_config_opts_release = -release
@@ -126,7 +130,8 @@ define $(package)_fetch_cmds
126130
$(call fetch_file,$(package),$($(package)_download_path),$($(package)_download_file),$($(package)_file_name),$($(package)_sha256_hash)) && \
127131
$(call fetch_file,$(package),$($(package)_download_path),$($(package)_qttranslations_file_name),$($(package)_qttranslations_file_name),$($(package)_qttranslations_sha256_hash)) && \
128132
$(call fetch_file,$(package),$($(package)_download_path),$($(package)_qttools_file_name),$($(package)_qttools_file_name),$($(package)_qttools_sha256_hash)) && \
129-
$(call fetch_file,$(package),$($(package)_download_path),$($(package)_qtsvg_file_name),$($(package)_qtsvg_file_name),$($(package)_qtsvg_sha256_hash))
133+
$(call fetch_file,$(package),$($(package)_download_path),$($(package)_qtsvg_file_name),$($(package)_qtsvg_file_name),$($(package)_qtsvg_sha256_hash)) && \
134+
$(call fetch_file,$(package),$($(package)_download_path),$($(package)_qtcharts_file_name),$($(package)_qtcharts_file_name),$($(package)_qtcharts_sha256_hash))
130135
endef
131136

132137
define $(package)_extract_cmds
@@ -135,6 +140,7 @@ define $(package)_extract_cmds
135140
echo "$($(package)_qttranslations_sha256_hash) $($(package)_source_dir)/$($(package)_qttranslations_file_name)" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \
136141
echo "$($(package)_qttools_sha256_hash) $($(package)_source_dir)/$($(package)_qttools_file_name)" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \
137142
echo "$($(package)_qtsvg_sha256_hash) $($(package)_source_dir)/$($(package)_qtsvg_file_name)" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \
143+
echo "$($(package)_qtcharts_sha256_hash) $($(package)_source_dir)/$($(package)_qtcharts_file_name)" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \
138144
$(build_SHA256SUM) -c $($(package)_extract_dir)/.$($(package)_file_name).hash && \
139145
mkdir qtbase && \
140146
tar --no-same-owner --strip-components=1 -xf $($(package)_source) -C qtbase && \
@@ -143,7 +149,9 @@ define $(package)_extract_cmds
143149
mkdir qttools && \
144150
tar --no-same-owner --strip-components=1 -xf $($(package)_source_dir)/$($(package)_qttools_file_name) -C qttools && \
145151
mkdir qtsvg && \
146-
tar --no-same-owner --strip-components=1 -xf $($(package)_source_dir)/$($(package)_qtsvg_file_name) -C qtsvg
152+
tar --no-same-owner --strip-components=1 -xf $($(package)_source_dir)/$($(package)_qtsvg_file_name) -C qtsvg && \
153+
mkdir qtcharts && \
154+
tar --no-same-owner --strip-components=1 -xf $($(package)_source_dir)/$($(package)_qtcharts_file_name) -C qtcharts
147155
endef
148156

149157
define $(package)_preprocess_cmds
@@ -193,6 +201,7 @@ define $(package)_config_cmds
193201
cd qtsvg/src/plugins && ../../../qtbase/bin/qmake plugins.pro -o Makefile && cd ../../.. && \
194202
cd qtsvg/src/plugins/imageformats && ../../../../qtbase/bin/qmake imageformats.pro -o Makefile && cd ../../../.. && \
195203
cd qtsvg/src/plugins/imageformats/svg && ../../../../../qtbase/bin/qmake svg.pro -o Makefile && cd ../../../../.. && \
204+
cd qtcharts && ../qtbase/bin/qmake qtcharts.pro -o Makefile && \
196205
cd qttools/src/linguist/lrelease/ && ../../../../qtbase/bin/qmake lrelease.pro -o Makefile && \
197206
cd ../lupdate/ && ../../../../qtbase/bin/qmake lupdate.pro -o Makefile && cd ../../../..
198207
endef
@@ -204,7 +213,8 @@ define $(package)_build_cmds
204213
$(MAKE) -C ../qttranslations && \
205214
$(MAKE) -C ../qtsvg/ && \
206215
$(MAKE) -C ../qtsvg/src/svg && \
207-
$(MAKE) -C ../qtsvg/src/plugins/imageformats
216+
$(MAKE) -C ../qtsvg/src/plugins/imageformats && \
217+
$(MAKE) -C ../qtcharts/
208218
endef
209219

210220
define $(package)_stage_cmds
@@ -214,6 +224,7 @@ define $(package)_stage_cmds
214224
$(MAKE) -C qtsvg INSTALL_ROOT=$($(package)_staging_dir) install_subtargets && \
215225
$(MAKE) -C qtsvg/src/svg/ INSTALL_ROOT=$($(package)_staging_dir) install_target && \
216226
$(MAKE) -C qtsvg/src/plugins/imageformats INSTALL_ROOT=$($(package)_staging_dir) install_subtargets && \
227+
$(MAKE) -C qtcharts INSTALL_ROOT=$($(package)_staging_dir) install_subtargets && \
217228
echo "---FURSZY232 --> $($(package)_staging_dir)" && \
218229
$(MAKE) -C qttranslations INSTALL_ROOT=$($(package)_staging_dir) install_subtargets && \
219230
if `test -f qtbase/src/plugins/platforms/xcb/xcb-static/libxcb-static.a`; then \

‎src/Makefile.qt.include‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,7 @@ BITCOIN_QT_INCLUDES = -I$(builddir)/qt -I$(srcdir)/qt -I$(srcdir)/qt/forms \
763763
-I$(builddir)/qt/forms
764764

765765
qt_libbitcoinqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \
766-
$(QT_INCLUDES) $(QT_DBUS_INCLUDES) $(PROTOBUF_CFLAGS) $(QR_CFLAGS) $(SVG_CFLAGS)
766+
$(QT_INCLUDES) $(QT_DBUS_INCLUDES) $(PROTOBUF_CFLAGS) $(QR_CFLAGS) $(SVG_CFLAGS) $(CHARTS_CFLAGS)
767767
qt_libbitcoinqt_a_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
768768
qt_libbitcoinqt_a_OBJCXXFLAGS = $(AM_OBJCXXFLAGS) $(QT_PIE_FLAGS)
769769

@@ -788,7 +788,7 @@ $(QT_MOC_CPP): $(PROTOBUF_H)
788788

789789
# pivx-qt binary #
790790
qt_pivx_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \
791-
$(QT_INCLUDES) $(PROTOBUF_CFLAGS) $(QR_CFLAGS) $(SVG_CFLAGS)
791+
$(QT_INCLUDES) $(PROTOBUF_CFLAGS) $(QR_CFLAGS) $(SVG_CFLAGS) $(CHARTS_CFLAGS)
792792
qt_pivx_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
793793

794794
qt_pivx_qt_SOURCES = qt/pivx.cpp
@@ -806,7 +806,7 @@ if ENABLE_ZMQ
806806
qt_pivx_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
807807
endif
808808
qt_pivx_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBBITCOIN_ZEROCOIN) $(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) \
809-
$(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(SVG_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \
809+
$(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(SVG_LIBS) $(CHARTS_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \
810810
$(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
811811
qt_pivx_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
812812
qt_pivx_qt_LIBTOOLFLAGS = $(AM_LIBTOOLFLAGS) --tag CXX

0 commit comments

Comments
 (0)