diff options
| author | Michal Klocek <michal.klocek@theqtcompany.com> | 2015-02-19 15:44:03 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-02-20 09:36:13 +0000 |
| commit | edb2ad9117ee1598f18ad79fd2493ca53b0c9513 (patch) | |
| tree | 88982fb845f1263ebe00c1ecb774b2ce75de07e6 /src/corelib/tools/qtimezoneprivate_p.h | |
| parent | b1ccf65102550bfd9eabd0311a2af4e1abedfcce (diff) | |
Fix compilation on Android
Commit 81a45e1f13fdf56129aed952a6e3479e16c14a2c replaced QSets with
QLists in QTimeZone, but forgot to adapt the Android code.
This commit fixes it.
Change-Id: I8704a39c44a9dc74147a4bb99a6f5d1bea53afa1
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/corelib/tools/qtimezoneprivate_p.h')
| -rw-r--r-- | src/corelib/tools/qtimezoneprivate_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qtimezoneprivate_p.h b/src/corelib/tools/qtimezoneprivate_p.h index 64827950e2..803ba1f57a 100644 --- a/src/corelib/tools/qtimezoneprivate_p.h +++ b/src/corelib/tools/qtimezoneprivate_p.h @@ -470,7 +470,7 @@ public: QByteArray systemTimeZoneId() const Q_DECL_OVERRIDE; - QSet<QByteArray> availableTimeZoneIds() const Q_DECL_OVERRIDE; + QList<QByteArray> availableTimeZoneIds() const Q_DECL_OVERRIDE; private: void init(const QByteArray &zoneId); |