diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-24 15:18:05 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-24 15:18:05 (GMT) |
| commit | 723dfce0f2af6d93d2c1b50f5e44ad3cf63e058c (patch) | |
| tree | f8e1c8693aceea8f1d2fc03d9ad1555b0a441a27 /src/gui/kernel/qapplication.cpp | |
| parent | f90d8f3fe7e39a20b93a2ddfe0704bc48f3bd5f9 (diff) | |
| parent | dab9d7c67ed2eda150c8da9e41db75f7eeeecd0d (diff) | |
| download | Qt-723dfce0f2af6d93d2c1b50f5e44ad3cf63e058c.zip Qt-723dfce0f2af6d93d2c1b50f5e44ad3cf63e058c.tar.gz Qt-723dfce0f2af6d93d2c1b50f5e44ad3cf63e058c.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/gui/kernel/qapplication_x11.cpp
Diffstat (limited to 'src/gui/kernel/qapplication.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 54e377e..05d9b3c 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -478,15 +478,12 @@ static inline bool isAlien(QWidget *widget) // ######## move to QApplicationPrivate // Default application palettes and fonts (per widget type) - -typedef QHash<QByteArray, QPalette> PaletteHash; Q_GLOBAL_STATIC(PaletteHash, app_palettes) PaletteHash *qt_app_palettes_hash() { return app_palettes(); } -typedef QHash<QByteArray, QFont> FontHash; Q_GLOBAL_STATIC(FontHash, app_fonts) FontHash *qt_app_fonts_hash() { |