QTZP::displayName(): avoid duplicating a check

Delegation to localeName(), when available, takes care of OffsetName,
so move displayName()'s handling of OffsetName to the #else of the
check for localeName().

Change-Id: I2063fab97588869805b172a0692b2cd9aebc77d5
Reviewed-by: Mate Barany <mate.barany@qt.io>

Author: ediosyncratic

src/corelib/time/qtimezoneprivate.cpp

@@ -197,12 +197,12 @@ QString QTimeZonePrivate::displayName(QTimeZone::TimeType timeType,
 {
     const Data tran = data(timeType);
     if (tran.atMSecsSinceEpoch != invalidMSecs()) {
+#if QT_CONFIG(timezone_locale) // Takes care of offsetformat:
+        return localeName(tran.atMSecsSinceEpoch, tran.offsetFromUtc, timeType, nameType, locale);
+#else // All this base can help with is offset names:
         if (nameType == QTimeZone::OffsetName && isAnglicLocale(locale))
             return isoOffsetFormat(tran.offsetFromUtc);
-
-#if QT_CONFIG(timezone_locale)
-        return localeName(tran.atMSecsSinceEpoch, tran.offsetFromUtc, timeType, nameType, locale);
-#endif
+#endif // Hopefully derived classes can do better.
     }
     return QString();
 }