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 /csv | |
| parent | 664aefb41351113fbd43962aa534befe18ff9d4a (diff) | |
| parent | 0ff658f908bc3e07bca9987dfd5b7c365b7d8353 (diff) | |
Merge branch 'unstable' into trackhat
Diffstat (limited to 'csv')
| -rw-r--r-- | csv/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | csv/csv.cpp | 1 | ||||
| -rw-r--r-- | csv/csv.h | 9 |
3 files changed, 9 insertions, 6 deletions
diff --git a/csv/CMakeLists.txt b/csv/CMakeLists.txt index 07dae55c..7e80317c 100644 --- a/csv/CMakeLists.txt +++ b/csv/CMakeLists.txt @@ -1,4 +1 @@ -opentrack_boilerplate(opentrack-csv NO-LIBRARY) -add_library(opentrack-csv STATIC ${opentrack-csv-c}) -opentrack_compat(opentrack-csv) -target_link_libraries(opentrack-csv ${MY_QT_LIBS}) +opentrack_boilerplate(opentrack-csv NO-LINKER-SCRIPT) diff --git a/csv/csv.cpp b/csv/csv.cpp index 2193ed80..26a36b70 100644 --- a/csv/csv.cpp +++ b/csv/csv.cpp @@ -8,7 +8,6 @@ * purpose with or without fee is hereby granted, provided that the above * * copyright notice and this permission notice appear in all copies. * */ -#define INSIDE_CSV #include "csv.h" #include <QTextDecoder> #include <QFile> @@ -1,4 +1,5 @@ #pragma once +#include <QtGlobal> #include <QObject> #include <QStringList> #include <QIODevice> @@ -6,7 +7,13 @@ #include <QRegExp> #include <QtGlobal> -class CSV +#ifdef BUILD_opentrack_csv +# define CSV_EXPORT Q_DECL_EXPORT +#else +# define CSV_EXPORT Q_DECL_IMPORT +#endif + +class CSV_EXPORT CSV { public: QString readLine(); |