Skip to content

Commit

Permalink
Disable the additional icon cache for Qt >= 6.5.1
Browse files Browse the repository at this point in the history
Qt 6.5.1 caches null icons again, so it does not suffer from the
performance issues caused by repeated searching for non-existent icons
anymore.

Follow-up to e3ca255.
  • Loading branch information
bjorn committed May 10, 2023
1 parent 1f3fc1b commit 3266469
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/tiled/utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
#endif
#include <QScreen>

#if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)
#if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0) && QT_VERSION < QT_VERSION_CHECK(6, 5, 1)
#include <QtCore/qapplicationstatic.h>
#endif

Expand Down Expand Up @@ -285,7 +285,7 @@ RangeSet<int> matchingRanges(const QStringList &words, QStringRef string)
return result;
}

#if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)
#if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0) && QT_VERSION < QT_VERSION_CHECK(6, 5, 1)
/*
* Caching icons here, since Qt no longer caches null icons in
* QIcon::fromTheme.
Expand Down

0 comments on commit 3266469

Please sign in to comment.