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/kernel/qapplication_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/kernel/qapplication_p.h')
| -rw-r--r-- | src/widgets/kernel/qapplication_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index 7a880986bf..ae4f0c2044 100644 --- a/src/widgets/kernel/qapplication_p.h +++ b/src/widgets/kernel/qapplication_p.h @@ -313,7 +313,7 @@ public: QPointer<QWSManager> last_manager; QWSServerCleaner qwsServerCleaner; # ifndef QT_NO_DIRECTPAINTER - QMap<WId, QDirectPainter *> *directPainters; + QHash<WId, QDirectPainter *> *directPainters; # endif QRect maxWindowRect(const QScreen *screen) const { return maxWindowRects[screen]; } void setMaxWindowRect(const QScreen *screen, int screenNo, const QRect &rect); @@ -393,7 +393,7 @@ public: private: #ifdef Q_WS_QWS - QMap<const QScreen*, QRect> maxWindowRects; + QHash<const QScreen*, QRect> maxWindowRects; #endif static QApplicationPrivate *self; |