diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-24 17:18:05 +0200 |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-24 17:18:05 +0200 |
| commit | 723dfce0f2af6d93d2c1b50f5e44ad3cf63e058c (patch) | |
| tree | f8e1c8693aceea8f1d2fc03d9ad1555b0a441a27 /src/gui/kernel/qapplication_p.h | |
| parent | f90d8f3fe7e39a20b93a2ddfe0704bc48f3bd5f9 (diff) | |
| parent | dab9d7c67ed2eda150c8da9e41db75f7eeeecd0d (diff) | |
| download | qt4-tools-723dfce0f2af6d93d2c1b50f5e44ad3cf63e058c.tar.gz | |
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_p.h')
| -rw-r--r-- | src/gui/kernel/qapplication_p.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h index c5d923538e..4b2bf15c83 100644 --- a/src/gui/kernel/qapplication_p.h +++ b/src/gui/kernel/qapplication_p.h @@ -206,6 +206,12 @@ public: { --threadData->loopLevel; } }; +typedef QHash<QByteArray, QFont> FontHash; +FontHash *qt_app_fonts_hash(); + +typedef QHash<QByteArray, QPalette> PaletteHash; +PaletteHash *qt_app_palettes_hash(); + class Q_GUI_EXPORT QApplicationPrivate : public QCoreApplicationPrivate { Q_DECLARE_PUBLIC(QApplication) |