Build the designer debian packages

Author: koppi

debian/control

@@ -105,6 +105,26 @@ Description: Qt6 G-Code editor library - example applications
  .
  This package contains example applications compiled against Qt6.
 
+Package: libqgcodeeditor-qt5-designer
+Architecture: any
+Depends: ${misc:Depends},
+        libqt5designer5,
+        libqgcodeeditor-qt5
+Description: Qt5 Designer plugin for QGCodeEditor widget
+ A widget for displaying and interacting with G-Code in Qt Designer.
+ This package contains the Qt Designer plugin for the QGCodeEditor widget
+ for use with Qt5.
+
+Package: libqgcodeeditor-qt6-designer
+Architecture: any
+Depends: ${misc:Depends},
+        libqt6designer6,
+        libqgcodeeditor-qt6
+Description: Qt6 Designer plugin for QGCodeEditor widget
+ A widget for displaying and interacting with G-Code in Qt Designer.
+ This package contains the Qt Designer plugin for the QGCodeEditor widget
+ for use with Qt6.
+
 Package: libqgcodeeditor-doc
 Section: doc
 Architecture: all

debian/rules

@@ -12,6 +12,10 @@ QMAKE_FLAGS = QMAKE_CXXFLAGS+="$(CXXFLAGS) $(CPPFLAGS)" QMAKE_LFLAGS+="$(LDFLAGS
 # Update this on SO name bumps so files get shoved around correctly
 SONAME=15
 
+# Designer plugin directories
+DESIGNER_QT5=QGcodeEditorDesignerQt5
+DESIGNER_QT6=QGcodeEditorDesignerQt6
+
 %:
 	dh $@
 
@@ -29,6 +33,12 @@ configure-stamp:
 	cp -r src/* QGcodeQt6
 	cd QGcodeQt6 && /usr/lib/qt6/bin/qmake6 -spec linux-g++ QT_QMAKE_VERSION=6 PREFIX=/usr INCLUDE_DIR=/usr/include/$${DEB_HOST_MULTIARCH}/qt6 LIB_DIR=/usr/lib/$${DEB_HOST_MULTIARCH} DESTDIR=$$PWD $(QMAKE_FLAGS)
 	rm -f QGcodeQt6/libqgcodeeditor_qt5.so* QGcodeQt6/libQGCodeEditor.prf QGcodeQt6/libQGCodeEditor.prl
+	mkdir -p $(DESIGNER_QT5)
+	cp -r designer/* $(DESIGNER_QT5)
+	cd $(DESIGNER_QT5) && /usr/bin/qmake -qt=5 PREFIX=/usr INCLUDE_DIR=/usr/include/$${DEB_HOST_MULTIARCH}/qt5 LIB_DIR=/usr/lib/$${DEB_HOST_MULTIARCH} DESTDIR=$$PWD $(QMAKE_FLAGS)
+	mkdir -p $(DESIGNER_QT6)
+	cp -r designer/* $(DESIGNER_QT6)
+	cd $(DESIGNER_QT6) && /usr/lib/qt6/bin/qmake6 -spec linux-g++ QT_QMAKE_VERSION=6 PREFIX=/usr INCLUDE_DIR=/usr/include/$${DEB_HOST_MULTIARCH}/qt6 LIB_DIR=/usr/lib/$${DEB_HOST_MULTIARCH} DESTDIR=$$PWD $(QMAKE_FLAGS)
 	touch $@
 
 override_dh_auto_configure: configure-stamp
@@ -39,6 +49,10 @@ build-library-stamp: configure-stamp
 	@echo "Built Qt5"
 	cd QGcodeQt6 && $(MAKE)
 	@echo "Built Qt6"
+	cd $(DESIGNER_QT5) && $(MAKE)
+	@echo "Built Qt5 Designer"
+	cd $(DESIGNER_QT6) && $(MAKE)
+	@echo "Built Qt6 Designer"
 	touch $@
 
 override_dh_auto_build: build-library-stamp
@@ -91,6 +105,11 @@ override_dh_auto_install:
 	cp -a examples/QGcodesimpleQt6/simple debian/libqgcodeeditor-qt6-examples/usr/lib/x86_64-linux-gnu/qgcodeeditor-examples/qt6/
 	cp -a examples/QGcodepipeQt6/pipe debian/libqgcodeeditor-qt6-examples/usr/lib/x86_64-linux-gnu/qgcodeeditor-examples/qt6/
 	cp -a examples/QGcodecontextMenuQt6/contextMenu debian/libqgcodeeditor-qt6-examples/usr/lib/x86_64-linux-gnu/qgcodeeditor-examples/qt6/
+	install -m0755 -d debian/libqgcodeeditor-qt5-designer/usr/lib/$${DEB_HOST_MULTIARCH}/qt5/plugins/designer
+	cp -a $(DESIGNER_QT5)/libqgcodeeditorplugin.so debian/libqgcodeeditor-qt5-designer/usr/lib/$${DEB_HOST_MULTIARCH}/qt5/plugins/designer/
+	install -m0755 -d debian/libqgcodeeditor-qt6-designer/usr/lib/$${DEB_HOST_MULTIARCH}/qt6/plugins/designer
+	cp -a $(DESIGNER_QT6)/libqgcodeeditorplugin.so debian/libqgcodeeditor-qt6-designer/usr/lib/$${DEB_HOST_MULTIARCH}/qt6/plugins/designer/
+	install -m0644 $(DESIGNER_QT6)/QGCodeEditorPlugin.json debian/libqgcodeeditor-qt6-designer/usr/lib/$${DEB_HOST_MULTIARCH}/qt6/plugins/designer/
 
 execute_after_dh_auto_install:
 	install -m0755 -d debian/libqgcodeeditor-qt5/usr/lib/$${DEB_HOST_MULTIARCH}

designer/QGCodeEditorPlugin.cpp

@@ -22,7 +22,11 @@
 #include <QtPlugin>
 
 #include <QtGlobal>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    #include <QtUiPlugin/QDesignerCustomWidgetInterface>
+    #include <QtUiPlugin/QDesignerExportWidget>
+    #define QDESIGNER_WIDGET_EXPORT QGCODEEDITOR_EXPORT
+#elif QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
     #include <QtUiPlugin/QDesignerExportWidget>
 #else
     #include <QtDesigner/QDesignerExportWidget>
@@ -34,6 +38,9 @@
 #  endif
 #endif
 
+#if QT_VERSION >= 0x060000
+class QGCodeEditor;
+#else
 class QDESIGNER_WIDGET_EXPORT GCodeEditor : public QGCodeEditor
 {
 public:
@@ -42,6 +49,7 @@ class QDESIGNER_WIDGET_EXPORT GCodeEditor : public QGCodeEditor
   {
   }
 };
+#endif
 
 QGCodeEditorPlugin::QGCodeEditorPlugin(QObject *parent)
  : QObject(parent)

designer/QGCodeEditorPlugin.h

@@ -33,9 +33,10 @@
 class QGCodeEditorPlugin : public QObject, public QDesignerCustomWidgetInterface
 {
   Q_OBJECT
-#if QT_VERSION >= 0x050000
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetCollectionInterface")
-//  Q_PLUGIN_METADATA(IID "QGCodeEditorPlugin" FILE "QGCodeEditorPlugin.json")
+#if QT_VERSION >= 0x060000
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.DesignerCustomWidget" FILE "QGCodeEditorPlugin.json")
+#elif QT_VERSION >= 0x050000
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetCollectionInterface" FILE "QGCodeEditorPlugin.json")
 #endif
   Q_INTERFACES(QDesignerCustomWidgetInterface)
  public:

designer/QGCodeEditorPlugin.json

@@ -1 +1,7 @@
-{ }
+{
+    "name": "QGCodeEditor",
+    "tooltip": "QGCodeEditor widget for displaying G-Code",
+    "whatsThis": "A widget for displaying and interacting with G-Code",
+    "properties": [],
+    "superclass": "QPlainTextEdit"
+}