1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Amend #if-ery to exclude MS QTZP backend declaration when not in use

Browse Source 
Since 2017 we've been using the ICU backend in preference to the MS
one, so there's no point declaring the MS one when it's not being
compiled.

Pick-to: 6.5
Change-Id: Ia7b770ec27bb627caace814b972967c4f7d63330
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 0de55973d37a951fb5d5f596d7967f1978865845)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Edward Welbourne 2023-10-30 19:10:53 +01:00 committed by Qt Cherry-pick Bot
parent 0dc1dac296
commit 371dd6c6bd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/time/qtimezoneprivate_p.h
View File

@ -379,7 +379,7 @@ private:
}; };
#endif // Q_OS_DARWIN #endif // Q_OS_DARWIN
#ifdef Q_OS_WIN #if defined(Q_OS_WIN) && !QT_CONFIG(icu)
class Q_AUTOTEST_EXPORT QWinTimeZonePrivate final : public QTimeZonePrivate class Q_AUTOTEST_EXPORT QWinTimeZonePrivate final : public QTimeZonePrivate
{ {
public: public:
@ -435,7 +435,7 @@ private:
QString m_daylightName; QString m_daylightName;
QList<QWinTransitionRule> m_tranRules; QList<QWinTransitionRule> m_tranRules;
}; };
#endif // Q_OS_WIN #endif // Q_OS_WIN && !icu
#ifdef Q_OS_ANDROID #ifdef Q_OS_ANDROID
class QAndroidTimeZonePrivate final : public QTimeZonePrivate class QAndroidTimeZonePrivate final : public QTimeZonePrivate