From fc9c576c1f58792bb9efa580940c51f9b776b5a7 Mon Sep 17 00:00:00 2001 From: lupoDharkael Date: Mon, 25 Dec 2017 22:32:21 +0100 Subject: [PATCH] Fix Windows build --- src/third-party/Qt-Color-Widgets/color_widgets.pri | 1 - .../Qt-Color-Widgets/include/color_wheel.hpp | 4 +--- .../include/colorwidgets_global.hpp | 14 -------------- 3 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 src/third-party/Qt-Color-Widgets/include/colorwidgets_global.hpp diff --git a/src/third-party/Qt-Color-Widgets/color_widgets.pri b/src/third-party/Qt-Color-Widgets/color_widgets.pri index 65e05eeb..29175aa4 100644 --- a/src/third-party/Qt-Color-Widgets/color_widgets.pri +++ b/src/third-party/Qt-Color-Widgets/color_widgets.pri @@ -24,7 +24,6 @@ SOURCES += \ HEADERS += \ $$PWD/include/color_wheel.hpp \ - $$PWD/include/colorwidgets_global.hpp \ $$PWD/src/color_utils.hpp RESOURCES += \ diff --git a/src/third-party/Qt-Color-Widgets/include/color_wheel.hpp b/src/third-party/Qt-Color-Widgets/include/color_wheel.hpp index 2725c609..3ff58619 100644 --- a/src/third-party/Qt-Color-Widgets/include/color_wheel.hpp +++ b/src/third-party/Qt-Color-Widgets/include/color_wheel.hpp @@ -22,8 +22,6 @@ #ifndef COLOR_WHEEL_HPP #define COLOR_WHEEL_HPP -#include "colorwidgets_global.hpp" - #include namespace color_widgets { @@ -34,7 +32,7 @@ namespace color_widgets { * It has an outer wheel to select the Hue and an intenal square to select * Saturation and Lightness. */ -class QCP_EXPORT ColorWheel : public QWidget +class ColorWheel : public QWidget { Q_OBJECT diff --git a/src/third-party/Qt-Color-Widgets/include/colorwidgets_global.hpp b/src/third-party/Qt-Color-Widgets/include/colorwidgets_global.hpp deleted file mode 100644 index 13add22d..00000000 --- a/src/third-party/Qt-Color-Widgets/include/colorwidgets_global.hpp +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef QT_COLOR_WIDGETS_GLOBAL_H -#define QT_COLOR_WIDGETS_GLOBAL_H - -#include - -#if defined(QTCOLORWIDGETS_LIBRARY) -# define QCP_EXPORT Q_DECL_EXPORT -#elif defined(QTCOLORWIDGETS_STATICALLY_LINKED) -# define QCP_EXPORT -#else -# define QCP_EXPORT Q_DECL_IMPORT -#endif - -#endif // QT_COLOR_WIDGETS_GLOBAL_H