Support non-Windows builds without QtCharts

huderlem · Dec 18, 2024 · 4f6291a · 4f6291a
1 parent bce3212
commit 4f6291a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/include/ui/wildmonchart.h b/include/ui/wildmonchart.h
@@ -78,7 +78,6 @@ public slots:
 
 // As of writing our static Qt build for Windows doesn't include the QtCharts module, so we dummy the class out here.
 // The charts module is additionally excluded from Windows in porymap.pro
-#define DISABLE_CHARTS_MODULE
 
 class WildMonChart : public QWidget
 {

diff --git a/porymap.pro b/porymap.pro
@@ -6,8 +6,10 @@
 
 QT       += core gui qml network
 
-!win32 {
+qtHaveModule(charts) {
     QT += charts
+} else {
+    warning("Qt module 'charts' not found, disabling chart features.")
 }
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -127,7 +127,7 @@ void MainWindow::initWindow() {
     ui->actionCheck_for_Updates->setVisible(false);
 #endif
 
-#ifdef DISABLE_CHARTS_MODULE
+#ifdef QT_CHARTS_LIB
     ui->pushButton_SummaryChart->setVisible(false);
 #endif