Skip to content

Commit b8b737f

Browse files
committed
removed qt5charts stuff from cmakelist
because it's not needed there. should be used in runtime. so it included qt5charts in installs
1 parent be7cc68 commit b8b737f

File tree

4 files changed

+3
-11
lines changed

4 files changed

+3
-11
lines changed

.docker/qgis3-build-deps.dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ RUN apt-get update \
3939
libqt5qml5 \
4040
libqt5quick5 \
4141
libqt5quickcontrols2-5 \
42-
libqt5charts5-dev \
4342
libqt5scintilla2-dev \
4443
libqt5sql5-sqlite \
4544
libqt5svg5-dev \

debian/control.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ Architecture: all
7878
Depends:
7979
libjs-jquery,
8080
libjs-leaflet,
81-
${misc:Depends}
81+
${misc:Depends},
82+
qml-module-qtcharts
8283
Description: QGIS - architecture-independent data
8384
QGIS is a Geographic Information System (GIS) which manages, analyzes and
8485
display databases of geographic information.

rpm/qgis.spec.template

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ BuildRequires: qwt-qt5-devel
107107
# Installation of QCA plugins must be explicit
108108
Requires: qca-qt5-ossl
109109
Requires: gpsbabel
110+
Requires: qt5-qtcharts
110111

111112
# We don't want to provide private Python extension libs
112113
%global __provides_exclude_from ^(%{python3_sitearch}|%{_libdir}/%{name}/plugins)/.*\.so(\.%{version})?$

src/gui/CMakeLists.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -737,15 +737,6 @@ SET(QGIS_GUI_MOC_HDRS
737737
FIND_PACKAGE(Qt5Qml REQUIRED)
738738
FIND_PACKAGE(Qt5QuickWidgets REQUIRED)
739739

740-
IF(Qt5Widgets_VERSION VERSION_GREATER 5.7.0)
741-
FIND_PACKAGE(Qt5Charts REQUIRED )
742-
IF(Qt5Charts_FOUND)
743-
INCLUDE_DIRECTORIES( ${Qt5Charts_INCLUDE_DIRS} )
744-
TARGET_LINK_LIBRARIES(${Qt5Charts_LIBRARIES})
745-
ENDIF(Qt5Charts_FOUND)
746-
ENDIF(Qt5Widgets_VERSION VERSION_GREATER 5.7.0)
747-
748-
749740
IF(Qt5Qml_FOUND)
750741
ADD_DEFINITIONS(-DWITH_QML)
751742
SET(QGIS_GUI_MOC_HDRS

0 commit comments

Comments
 (0)