From 9570b906dc2c04f9d82bd51affc376dde10e80b4 Mon Sep 17 00:00:00 2001 From: Razi Alavizadeh Date: Wed, 19 Dec 2018 03:54:45 +0330 Subject: [PATCH 1/3] MSVC: Fix --- test/test_multiplot/test_multiplot.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/test/test_multiplot/test_multiplot.pro b/test/test_multiplot/test_multiplot.pro index c48573fe36..2598064980 100644 --- a/test/test_multiplot/test_multiplot.pro +++ b/test/test_multiplot/test_multiplot.pro @@ -16,6 +16,7 @@ INCLUDEPATH += ../../lib CONFIG (debug, debug|release):LIBS += -L../../lib/debug -ljkqtplotterlib CONFIG (release):LIBS += -L../../lib/release -ljkqtplotterlib +win32-msvc*: DEFINES += _USE_MATH_DEFINES # here you can activate some debug options #DEFINES += SHOW_JKQTPLOTTER_DEBUG From 6f1f1c9ddf00b7db2335f9e88a6840d014c807e7 Mon Sep 17 00:00:00 2001 From: Razi Alavizadeh Date: Wed, 19 Dec 2018 04:55:34 +0330 Subject: [PATCH 2/3] MSVC: Fix compile issue when exporting function from DLL --- lib/jkqtplottertools/jkqtpimagetools.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jkqtplottertools/jkqtpimagetools.h b/lib/jkqtplottertools/jkqtpimagetools.h index 18c61a2806..409b092a0e 100644 --- a/lib/jkqtplottertools/jkqtpimagetools.h +++ b/lib/jkqtplottertools/jkqtpimagetools.h @@ -527,7 +527,7 @@ QStringList LIB_EXPORT JKQTPimagePlot_getPredefinedPalettes(); -int* LIB_EXPORT JKQTPimagePlot_getCreateLUT(QList &lutstore, JKQTPMathImageColorPalette palette); +LIB_EXPORT int* JKQTPimagePlot_getCreateLUT(QList &lutstore, JKQTPMathImageColorPalette palette); void LIB_EXPORT JKQTPimagePlot_freeLUTs(QList &lutstore); From 8896eed69cd2a3ce73e07e146e2921c28b3f130f Mon Sep 17 00:00:00 2001 From: Razi Alavizadeh Date: Wed, 19 Dec 2018 05:02:38 +0330 Subject: [PATCH 3/3] MSVC: Fix ambiguous call to JKQtBasePlotter::JKQtBasePlotter(void) --- lib/jkqtplotter/jkqtpbaseplotter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jkqtplotter/jkqtpbaseplotter.h b/lib/jkqtplotter/jkqtpbaseplotter.h index 02be0d3d7b..5d3265d6ea 100644 --- a/lib/jkqtplotter/jkqtpbaseplotter.h +++ b/lib/jkqtplotter/jkqtpbaseplotter.h @@ -759,7 +759,7 @@ class LIB_EXPORT JKQtBasePlotter: public QObject { * will be managed (freed) by this class. If \a datastore_internal is \c false the class will use tha datastore provided * in \a datast as an external datastore. You can modify this later by using useInternalDatastore() and useExternalDatastore(). */ - JKQtBasePlotter(bool datastore_internal=true, QObject* parent=nullptr, JKQTPdatastore* datast=nullptr); + JKQtBasePlotter(bool datastore_internal, QObject* parent=nullptr, JKQTPdatastore* datast=nullptr); /** \brief class destructor */ virtual ~JKQtBasePlotter();