diff options
Diffstat (limited to 'src/gui/image/qicon.h')
-rw-r--r-- | src/gui/image/qicon.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/image/qicon.h b/src/gui/image/qicon.h index 40d3e92af9..653ba6fda4 100644 --- a/src/gui/image/qicon.h +++ b/src/gui/image/qicon.h @@ -63,7 +63,7 @@ public: #ifdef Q_COMPILER_RVALUE_REFS QIcon(QIcon &&other) Q_DECL_NOEXCEPT : d(other.d) - { other.d = Q_NULLPTR; } + { other.d = nullptr; } #endif explicit QIcon(const QString &fileName); // file or resource name explicit QIcon(QIconEngine *engine); @@ -118,6 +118,9 @@ public: static QStringList themeSearchPaths(); static void setThemeSearchPaths(const QStringList &searchpath); + static QStringList fallbackSearchPaths(); + static void setFallbackSearchPaths(const QStringList &paths); + static QString themeName(); static void setThemeName(const QString &path); @@ -147,7 +150,7 @@ Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QIcon &); #endif Q_GUI_EXPORT QString qt_findAtNxFile(const QString &baseFileName, qreal targetDevicePixelRatio, - qreal *sourceDevicePixelRatio = Q_NULLPTR); + qreal *sourceDevicePixelRatio = nullptr); QT_END_NAMESPACE |