diff --git a/cmake/modules/BuildQColorWidgets.cmake b/cmake/modules/BuildQColorWidgets.cmake --- a/cmake/modules/BuildQColorWidgets.cmake +++ b/cmake/modules/BuildQColorWidgets.cmake @@ -22,6 +22,7 @@ include(ExternalProject) ExternalProject_Add(QCW PREFIX qcw GIT_REPOSITORY https://github.com/mbasaglia/Qt-Color-Widgets + PATCH_COMMAND patch -p1 -i ${CMAKE_CURRENT_LIST_DIR}/qt_5_2_moc_creation_namespace_fix.diff INSTALL_COMMAND "") ExternalProject_Get_Property(QCW binary_dir source_dir) diff --git a/cmake/modules/qt_5_2_moc_creation_namespace_fix.diff b/cmake/modules/qt_5_2_moc_creation_namespace_fix.diff new file mode 100644 --- /dev/null +++ b/cmake/modules/qt_5_2_moc_creation_namespace_fix.diff @@ -0,0 +1,39 @@ +diff --git a/include/color_dialog.hpp b/include/color_dialog.hpp +index 5c7653d..895215c 100644 +--- a/include/color_dialog.hpp ++++ b/include/color_dialog.hpp +@@ -30,6 +30,8 @@ + + class QAbstractButton; + ++using namespace color_widgets; ++ + namespace color_widgets { + + class QCP_EXPORT ColorDialog : public QDialog +diff --git a/include/color_list_widget.hpp b/include/color_list_widget.hpp +index 282bea5..7d8e0c5 100644 +--- a/include/color_list_widget.hpp ++++ b/include/color_list_widget.hpp +@@ -25,6 +25,8 @@ + #include "abstract_widget_list.hpp" + #include "color_wheel.hpp" + ++using namespace color_widgets; ++ + namespace color_widgets { + + class QCP_EXPORT ColorListWidget : public AbstractWidgetList +diff --git a/include/color_selector.hpp b/include/color_selector.hpp +index db817d5..48b374d 100644 +--- a/include/color_selector.hpp ++++ b/include/color_selector.hpp +@@ -25,6 +25,8 @@ + #include "color_preview.hpp" + #include "color_wheel.hpp" + ++using namespace color_widgets; ++ + namespace color_widgets { + + /**