Compare commits

..

No commits in common. "2d7167735ae42de42180ee18eec7b931c542be56" and "d6e56a9e2a78398607ed9afb70db07a8e78ca6d9" have entirely different histories.

3 changed files with 4 additions and 7 deletions

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

View File

@ -17,11 +17,6 @@
# endif // RIBBONUI_BUILD_STATIC_LIB # endif // RIBBONUI_BUILD_STATIC_LIB
#endif // RIBBONUI_API #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 { namespace RibbonIconsFilledEnum {
Q_NAMESPACE Q_NAMESPACE
enum class RibbonIcons_Filled{ enum class RibbonIcons_Filled{

View File

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