diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-03-05 10:44:04 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-03-05 10:44:48 +0100 |
| commit | d51abed57a8f677a0d4eac57fd3f16bd4662190a (patch) | |
| tree | b3e173db4b72edbff6cb8dcc203c3d4526a1b51b /src/widgets/widgets/qwidgetanimator_p.h | |
| parent | 07ae18f96e87a2db40ae014f28893f1080efa7ae (diff) | |
| parent | 0862d7f78af978cf513097b3bdc33cd8096dee75 (diff) | |
Merge remote-tracking branch 'origin/master' into api_changes
Change-Id: Ibcb1f7070f50968b77b66112750ce5c70fc0b6d0
Diffstat (limited to 'src/widgets/widgets/qwidgetanimator_p.h')
| -rw-r--r-- | src/widgets/widgets/qwidgetanimator_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/widgets/qwidgetanimator_p.h b/src/widgets/widgets/qwidgetanimator_p.h index e2054401d6..82f81a704f 100644 --- a/src/widgets/widgets/qwidgetanimator_p.h +++ b/src/widgets/widgets/qwidgetanimator_p.h @@ -54,7 +54,7 @@ // #include <qobject.h> -#include <qmap.h> +#include <qhash.h> QT_BEGIN_NAMESPACE @@ -79,7 +79,7 @@ private Q_SLOTS: #endif private: - typedef QMap<QWidget*, QPropertyAnimation*> AnimationMap; + typedef QHash<QWidget*, QPropertyAnimation*> AnimationMap; AnimationMap m_animation_map; QMainWindowLayout *m_mainWindowLayout; }; |