From f3e685e69285f194977b149ae874ee9e177b65c1 Mon Sep 17 00:00:00 2001
From: etet100 <etet100>
Date: Mon, 11 Nov 2024 10:36:31 +0100
Subject: [PATCH] Fixed .pro, CRC and PropertyEditor

---
 .gitignore            |  1 +
 candle.pro            |  2 +-
 src/candle/Arduino.h  | 12 ------------
 src/candle/candle.pro | 15 +++++----------
 src/vendor/vendor.pro |  7 +------
 5 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100644 src/candle/Arduino.h

diff --git a/.gitignore b/.gitignore
index aa3ae597..689ee7ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,7 @@ Temporary Items
 
 # Build dir
 build-*
+build
 
 # Binaries
 bin/*
diff --git a/candle.pro b/candle.pro
index 95880710..0855112c 100644
--- a/candle.pro
+++ b/candle.pro
@@ -3,7 +3,7 @@ TEMPLATE = subdirs
 SUBDIRS =   src/candle \
             src/designerplugins \
             src/vendor
-            
+
 # Make plugins translations
 system(qmake src/candleplugins/candleplugins.pro)
 
diff --git a/src/candle/Arduino.h b/src/candle/Arduino.h
deleted file mode 100644
index f0094980..00000000
--- a/src/candle/Arduino.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// This file is a part of "G-Pilot (formerly Candle)" application.
-// Copyright 2015-2021 Hayrullin Denis Ravilevich
-// Copyright 2024 BTS
-
-#ifndef ARDUINO_H
-#define ARDUINO_H
-
-#include <stdint.h>
-
-#define yield()
-
-#endif // ARDUINO_H
diff --git a/src/candle/candle.pro b/src/candle/candle.pro
index b2a8cdbb..180c1b98 100644
--- a/src/candle/candle.pro
+++ b/src/candle/candle.pro
@@ -14,6 +14,8 @@ VERSION=1.0.0.0
 
 # DEFINES += DEBUG_UCNC_COMMUNICATION=1
 # DEFINES += DEBUG_RAW_TCP_COMMUNICATION=1
+# QT_DEBUG_PLUGINS=1
+# DEFINES += QT_DEBUG_PLUGINS=1
 
 win32: {
     DEFINES += WINDOWS
@@ -129,16 +131,8 @@ SOURCES += main.cpp\
     drawers/selectiondrawer.cpp \
     scripting/scriptvars.cpp \
     widgets/dropwidget.cpp \
-    ../vendor/CRC/src/CrcFastReverse.cpp \
-    ../vendor/CRC/src/CRC.cpp \
-    ../vendor/CRC/src/CRC8.cpp \
-    ../vendor/CRC/src/CRC12.cpp \
-    ../vendor/CRC/src/CRC16.cpp \
-    ../vendor/CRC/src/CRC32.cpp \
-    ../vendor/CRC/src/CRC64.cpp
 
 HEADERS  += frmmain.h \
-    Arduino.h \
     communicator.h \
     config/configuration.h \
     config/module/configurationconnection.h \
@@ -238,10 +232,11 @@ RESOURCES += \
 
 INCLUDEPATH += ../designerplugins/customwidgetsplugin
 INCLUDEPATH += ../vendor/PropertyEditor
-INCLUDEPATH += ../vendor/CRC/src
+
+include(../vendor/CRC/CRC.pri)
+include(../vendor/PropertyEditor/PropertyEditor.pri)
 
 LIBS += -L../designerplugins/customwidgetsplugin -lcustomwidgets
-LIBS += -L../vendor/PropertyEditor -lPropertyEditor
 
 # qtPrepareTool(LRELEASE, lrelease)
 # for(tsfile, TRANSLATIONS) {
diff --git a/src/vendor/vendor.pro b/src/vendor/vendor.pro
index 4235d090..ee1a5e23 100644
--- a/src/vendor/vendor.pro
+++ b/src/vendor/vendor.pro
@@ -1,11 +1,6 @@
 TEMPLATE = subdirs
 
 SUBDIRS =   uCNC \
+            CRC \
             PropertyEditor
 
-SOURCES += CRC/src/CRC.cpp \
-           CRC/src/CRC8.cpp
-INCLUDEPATH += CRC
-HEADERS += CRC/src/CRC.h \
-           CRC/src/CRC8.h
-