From 495071089a55ee40124a59abd6314ab90dcec4a6 Mon Sep 17 00:00:00 2001 From: Atul R Date: Fri, 20 Sep 2019 23:45:11 +0200 Subject: [PATCH] move ntabwidget over to cmake --- CMakeLists.txt | 1 + src/cpp/QtWidgets/QTabWidget/{ntabwidget.h => ntabwidget.hpp} | 1 + src/cpp/QtWidgets/QTabWidget/qtabwidget_wrap.h | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) rename src/cpp/QtWidgets/QTabWidget/{ntabwidget.h => ntabwidget.hpp} (99%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a30f3f55..1654da035 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,6 +78,7 @@ add_library(${CORE_WIDGETS_ADDON} SHARED "${PROJECT_SOURCE_DIR}/src/cpp/QtWidgets/QRadioButton/nradiobutton.hpp" "${PROJECT_SOURCE_DIR}/src/cpp/QtWidgets/QPlainTextEdit/nplaintextedit.hpp" "${PROJECT_SOURCE_DIR}/src/cpp/QtWidgets/QScrollArea/nscrollarea.hpp" + "${PROJECT_SOURCE_DIR}/src/cpp/QtWidgets/QTabWidget/ntabwidget.hpp" ) # common diff --git a/src/cpp/QtWidgets/QTabWidget/ntabwidget.h b/src/cpp/QtWidgets/QTabWidget/ntabwidget.hpp similarity index 99% rename from src/cpp/QtWidgets/QTabWidget/ntabwidget.h rename to src/cpp/QtWidgets/QTabWidget/ntabwidget.hpp index 221eed088..b358d0801 100644 --- a/src/cpp/QtWidgets/QTabWidget/ntabwidget.h +++ b/src/cpp/QtWidgets/QTabWidget/ntabwidget.hpp @@ -6,6 +6,7 @@ class NTabWidget: public QTabWidget, public NodeWidget { + Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QTabWidget) public: using QTabWidget::QTabWidget; //inherit all constructors of QTabWidget diff --git a/src/cpp/QtWidgets/QTabWidget/qtabwidget_wrap.h b/src/cpp/QtWidgets/QTabWidget/qtabwidget_wrap.h index c12540498..765bb076a 100644 --- a/src/cpp/QtWidgets/QTabWidget/qtabwidget_wrap.h +++ b/src/cpp/QtWidgets/QTabWidget/qtabwidget_wrap.h @@ -1,7 +1,7 @@ #pragma once #include -#include "ntabwidget.h" +#include "ntabwidget.hpp" #include "src/cpp/QtWidgets/QWidget/qwidget_macro.h" #include "src/cpp/Extras/Utils/nutils.h"