RibbonUI: Code optimized.

This reverts commit d6e56a9e2a.

lib_source/3rdparty/qwindowkit

@@ -1 +1 @@
-Subproject commit 15c5605a6a55f9fc08e9b8fa2644b2027e673812
+Subproject commit 87b7caada401149efda7bfee5289babdbcd5165f

lib_source/definitions.h

@@ -17,6 +17,11 @@
 #  endif // RIBBONUI_BUILD_STATIC_LIB
 #endif // RIBBONUI_API
 
+#define STR(x) #x
+#define JOIN(a,b,c) STR(a.b.c)
+#define _VER_JOIN(x) JOIN x
+#define VER_JOIN(x) _VER_JOIN((x))
+
 namespace RibbonIconsFilledEnum {
 Q_NAMESPACE
 enum class RibbonIcons_Filled{

lib_source/ribbonui.cpp

@@ -3,9 +3,7 @@
 #include <QOperatingSystemVersion>
 #include <QWKQuick/qwkquickglobal.h>
 #include <QtQuick/QQuickWindow>
-#define STR(x) #x
-#define JOIN(a,b,c) STR(a.b.c)
-#define VER_JOIN(x) JOIN(x)
+#include "definitions.h"
 
 RibbonUI::RibbonUI(QQuickItem *parent)
     : QQuickItem(parent)