more possible build options (use / don't use such libraries as QWT, KChart, ThreadWeaver)

4 files changed, 15 insertions, 8 deletions

diff --git a/src/analyze/gui/aboutdialog.cpp b/src/analyze/gui/aboutdialog.cpp
index 769d851..fbadfdb 100644
--- a/src/analyze/gui/aboutdialog.cpp
+++ b/src/analyze/gui/aboutdialog.cpp
@@ -2,6 +2,7 @@
 #include "ui_aboutdialog.h"
 
 #include "aboutdata.h"
+#include "gui_config.h"
 
 #include <math.h>
 #include <QFontMetrics>
@@ -33,13 +34,19 @@ AboutDialog::AboutDialog(QWidget *parent) :
 #endif
         QString(
         "<p>Uses <a href=https://www.qt.io>Qt framework</a> v.%1 libraries on terms of " \
-        "<a href=https://www.gnu.org/licenses/lgpl-3.0.en.html>LGPL</a>.</p>" \
+        "<a href=https://www.gnu.org/licenses/lgpl-3.0.en.html>LGPL</a>.</p>")
+        .arg(QT_VERSION_STR)
+#ifdef THREAD_WEAVER
+        + QString(
         "<p>Uses <a href=https://cgit.kde.org/threadweaver.git>ThreadWeaver library</a> " \
-        "on terms of <a href=https://www.gnu.org/licenses/lgpl-3.0.en.html>LGPL</a>.</p>" \
+        "on terms of <a href=https://www.gnu.org/licenses/lgpl-3.0.en.html>LGPL</a>.</p>")
+#endif
+#ifdef QWT_FOUND
+        + QString(
         "<p>The application is based in part on the work of the " \
         "<a href=http://qwt.sf.net>Qwt project</a> on terms of " \
         "<a href=http://qwt.sourceforge.net/qwtlicense.html>Qwt License</a>.</p>")
-        .arg(QT_VERSION_STR)
+#endif
 #ifdef WINDOWS
         + QString(
         "<p>Application icon (free for commercial use): Jack Cai " \
diff --git a/src/analyze/gui/chartwidgetqwtplot.cpp b/src/analyze/gui/chartwidgetqwtplot.cpp
index 5d4dfde..e9bc8b3 100644
--- a/src/analyze/gui/chartwidgetqwtplot.cpp
+++ b/src/analyze/gui/chartwidgetqwtplot.cpp
@@ -116,7 +116,7 @@ ChartOptions::Options ChartOptions::toggleOption(Options option)
 }
 
 ChartWidgetQwtPlot::ChartWidgetQwtPlot(QWidget *parent, Options options)
-    : QwtPlot(parent), m_model(nullptr), m_isSizeModel(false), ChartOptions(options),
+    : QwtPlot(parent), ChartOptions(options), m_model(nullptr), m_isSizeModel(false),
       m_zoomer(new Zoomer(this))
 {
     setCanvasBackground(Qt::white);
diff --git a/src/analyze/gui/histogramwidgetqwtplot.cpp b/src/analyze/gui/histogramwidgetqwtplot.cpp
index d037725..5870eb2 100644
--- a/src/analyze/gui/histogramwidgetqwtplot.cpp
+++ b/src/analyze/gui/histogramwidgetqwtplot.cpp
@@ -1,7 +1,9 @@
 #include "histogramwidgetqwtplot.h"
 #include "histogrammodel.h"
-#include "noklib.h"
 #include "util.h"
+#ifdef NO_K_LIB
+#include "noklib.h"
+#endif
 
 #include <math.h>
 
diff --git a/src/analyze/gui/mainwindow.cpp b/src/analyze/gui/mainwindow.cpp
index 0b99bd7..5affcde 100644
--- a/src/analyze/gui/mainwindow.cpp
+++ b/src/analyze/gui/mainwindow.cpp
@@ -25,6 +25,7 @@
 #include <ui_mainwindow_noklib.h>
 #include <QAbstractButton>
 #include <QFileDialog>
+#include <QSettings>
 #else
 #include <ui_mainwindow.h>
 #include <KConfigGroup>
@@ -64,9 +65,6 @@
 #include "chartwidget.h"
 #include "histogrammodel.h"
 #include "histogramwidget.h"
-#if QWT_FOUND
-#include <QSettings>
-#endif
 #endif
 
 using namespace std;