From 18e3a907af45f0b5f4138088f8ff762ad49255d9 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 12 Jun 2019 20:39:02 +0200 Subject: [PATCH] Adapt to changes in c++utilities --- global.h | 4 ++-- resources/qtconfigarguments.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/global.h b/global.h index a68e6fa..62c958d 100644 --- a/global.h +++ b/global.h @@ -10,8 +10,8 @@ #define QT_UTILITIES_EXPORT #define QT_UTILITIES_IMPORT #else -#define QT_UTILITIES_EXPORT LIB_EXPORT -#define QT_UTILITIES_IMPORT LIB_IMPORT +#define QT_UTILITIES_EXPORT CPP_UTILITIES_GENERIC_LIB_EXPORT +#define QT_UTILITIES_IMPORT CPP_UTILITIES_GENERIC_LIB_IMPORT #endif /*! diff --git a/resources/qtconfigarguments.cpp b/resources/qtconfigarguments.cpp index d87f466..4a19966 100644 --- a/resources/qtconfigarguments.cpp +++ b/resources/qtconfigarguments.cpp @@ -169,7 +169,7 @@ void QtConfigArguments::applySettings(bool preventApplyingDefaultFont) const QGuiApplication::setFont(QFont(QStringLiteral("Segoe UI"), 9)); } #else - VAR_UNUSED(preventApplyingDefaultFont) + CPP_UTILITIES_UNUSED(preventApplyingDefaultFont) #endif if (m_libraryPathsArg.isPresent()) { QStringList libraryPaths;