Adapt to changes in c++utilities
This commit is contained in:
parent
b3e7c390d9
commit
18e3a907af
4
global.h
4
global.h
|
@ -10,8 +10,8 @@
|
||||||
#define QT_UTILITIES_EXPORT
|
#define QT_UTILITIES_EXPORT
|
||||||
#define QT_UTILITIES_IMPORT
|
#define QT_UTILITIES_IMPORT
|
||||||
#else
|
#else
|
||||||
#define QT_UTILITIES_EXPORT LIB_EXPORT
|
#define QT_UTILITIES_EXPORT CPP_UTILITIES_GENERIC_LIB_EXPORT
|
||||||
#define QT_UTILITIES_IMPORT LIB_IMPORT
|
#define QT_UTILITIES_IMPORT CPP_UTILITIES_GENERIC_LIB_IMPORT
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
|
|
@ -169,7 +169,7 @@ void QtConfigArguments::applySettings(bool preventApplyingDefaultFont) const
|
||||||
QGuiApplication::setFont(QFont(QStringLiteral("Segoe UI"), 9));
|
QGuiApplication::setFont(QFont(QStringLiteral("Segoe UI"), 9));
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
VAR_UNUSED(preventApplyingDefaultFont)
|
CPP_UTILITIES_UNUSED(preventApplyingDefaultFont)
|
||||||
#endif
|
#endif
|
||||||
if (m_libraryPathsArg.isPresent()) {
|
if (m_libraryPathsArg.isPresent()) {
|
||||||
QStringList libraryPaths;
|
QStringList libraryPaths;
|
||||||
|
|
Loading…
Reference in New Issue