diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-11-01 08:56:23 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-11-01 08:56:23 +0100 |
| commit | 7e3807d048c5e0a8e0aa64fb49807bf5dfd11fc1 (patch) | |
| tree | 22029a8b36a593585dcd962b81ff80199a4f9984 /spline-widget | |
| parent | 664aefb41351113fbd43962aa534befe18ff9d4a (diff) | |
| parent | 0ff658f908bc3e07bca9987dfd5b7c365b7d8353 (diff) | |
Merge branch 'unstable' into trackhat
Diffstat (limited to 'spline-widget')
| -rw-r--r-- | spline-widget/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | spline-widget/functionconfig.cpp | 2 | ||||
| -rw-r--r-- | spline-widget/functionconfig.h | 9 | ||||
| -rw-r--r-- | spline-widget/qfunctionconfigurator.h | 4 |
4 files changed, 12 insertions, 10 deletions
diff --git a/spline-widget/CMakeLists.txt b/spline-widget/CMakeLists.txt index 522491ea..03706d91 100644 --- a/spline-widget/CMakeLists.txt +++ b/spline-widget/CMakeLists.txt @@ -1,6 +1 @@ -opentrack_boilerplate(opentrack-spline-widget NO-LIBRARY) -opentrack_qt(opentrack-spline-widget) -add_library(opentrack-spline-widget STATIC ${opentrack-spline-widget-all}) -opentrack_compat(opentrack-spline-widget) -target_include_directories(opentrack-spline-widget PUBLIC qfunctionconfigurator/) -target_link_libraries(opentrack-spline-widget ${MY_QT_LIBS}) +opentrack_boilerplate(opentrack-spline-widget NO-LINKER-SCRIPT) diff --git a/spline-widget/functionconfig.cpp b/spline-widget/functionconfig.cpp index 27f3bf40..dcc9ca65 100644 --- a/spline-widget/functionconfig.cpp +++ b/spline-widget/functionconfig.cpp @@ -6,11 +6,11 @@ * notice appear in all copies. */ +#include "functionconfig.h" #include <QMutexLocker> #include <QCoreApplication> #include <QPointF> #include <QList> -#include "functionconfig.h" #include <QtAlgorithms> #include <QtAlgorithms> #include <QSettings> diff --git a/spline-widget/functionconfig.h b/spline-widget/functionconfig.h index 6d76d0de..3d2fc23c 100644 --- a/spline-widget/functionconfig.h +++ b/spline-widget/functionconfig.h @@ -8,6 +8,7 @@ #pragma once +#include <QtGlobal> #include <QList> #include <QPointF> #include <QString> @@ -17,7 +18,13 @@ #include <limits> #include "opentrack-compat/qcopyable-mutex.hpp" -class Map { +#ifdef BUILD_opentrack_spline_widget +# define SPLINE_WIDGET_EXPORT Q_DECL_EXPORT +#else +# define SPLINE_WIDGET_EXPORT Q_DECL_IMPORT +#endif + +class SPLINE_WIDGET_EXPORT Map { private: static constexpr int value_count = 10000; diff --git a/spline-widget/qfunctionconfigurator.h b/spline-widget/qfunctionconfigurator.h index baea9e34..4a9cb5f1 100644 --- a/spline-widget/qfunctionconfigurator.h +++ b/spline-widget/qfunctionconfigurator.h @@ -12,10 +12,10 @@ #include <QWidget> #include <QtGui> #include <QPointF> -#include "spline-widget/functionconfig.h" +#include "functionconfig.h" #include "opentrack/plugin-api.hpp" -class QFunctionConfigurator : public QWidget +class SPLINE_WIDGET_EXPORT QFunctionConfigurator : public QWidget { Q_OBJECT Q_PROPERTY(QColor colorBezier READ colorBezier WRITE setColorBezier) |