tempo-plotter Changeset - b4a54ebed100 · protofusion repositories

Changeset - b4a54ebed100

Parent rev.

Child rev.

[Not reviewed]

channelmanager

0 1 1

Hasan Yavuz ÖZDERYA - 9 years ago 2017-01-29 10:08:09
hy@ozderya.net

patch for compiling colorwidgets under Qt 5.2

qt 5.2 creates moc files incorrectly due to namespaces

2 files changed with 40 insertions and 0 deletions:

cmake/modules/BuildQColorWidgets.cmake

cmake/modules/qt_5_2_moc_creation_namespace_fix.diff

0 comments (0 inline, 0 general)

cmake/modules/BuildQColorWidgets.cmake

➞

Show inline comments

@@ @@ -13,17 +13,18 @@ @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
+#
 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)
 set(QCW_LIBRARY ${binary_dir}/libColorWidgets-qt5.a)
 set(QCW_INCLUDE_DIR ${source_dir}/include)

cmake/modules/qt_5_2_moc_creation_namespace_fix.diff

➞

Show inline comments

@@ new file 100644 @@
 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 {
  /**

0 comments (0 inline, 0 general)