# HG changeset patch # User Hasan Yavuz Ă–ZDERYA # Date 2017-08-27 11:33:33 # Node ID 7d24a4ccef20d1756bbe2437fe4ee47675be49a8 # Parent 98b18b0fc501baa2a7b45ebb61cea8cca3261e60 removed qt 5.2 patch for color widgets library diff --git a/cmake/modules/BuildQColorWidgets.cmake b/cmake/modules/BuildQColorWidgets.cmake --- a/cmake/modules/BuildQColorWidgets.cmake +++ b/cmake/modules/BuildQColorWidgets.cmake @@ -22,7 +22,6 @@ include(ExternalProject) ExternalProject_Add(QCW PREFIX qcw GIT_REPOSITORY https://github.com/mbasaglia/Qt-Color-Widgets - PATCH_COMMAND patch -t -p1 -i ${CMAKE_CURRENT_LIST_DIR}/qt_5_2_moc_creation_namespace_fix.diff CMAKE_CACHE_ARGS "-DCMAKE_CXX_FLAGS:string=-D QTCOLORWIDGETS_STATICALLY_LINKED" UPDATE_COMMAND "" INSTALL_COMMAND "") diff --git a/cmake/modules/qt_5_2_moc_creation_namespace_fix.diff b/cmake/modules/qt_5_2_moc_creation_namespace_fix.diff deleted file mode 100644 --- a/cmake/modules/qt_5_2_moc_creation_namespace_fix.diff +++ /dev/null @@ -1,39 +0,0 @@ -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 { - - /**