diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-10-03 23:00:11 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-10-03 23:00:11 (GMT) |
| commit | 8085c3cbc54f88403abb9af20323f045643ac58f (patch) | |
| tree | 6862461615f6dfa3a90c004f8b2557fa878760a1 /src/gui | |
| parent | 04635d2e122b4fe77ff3d03a0cddd23a09acf50c (diff) | |
| parent | 92f06c223ba2457e74944a786bed629bdf00ca4b (diff) | |
| download | Qt-8085c3cbc54f88403abb9af20323f045643ac58f.zip Qt-8085c3cbc54f88403abb9af20323f045643ac58f.tar.gz Qt-8085c3cbc54f88403abb9af20323f045643ac58f.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qsoftkeymanager.cpp | 2 | ||||
| -rw-r--r-- | src/gui/text/qfontengine_ft.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/qdialogbuttonbox.cpp | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp index 9caa37e..cd3450e 100644 --- a/src/gui/kernel/qsoftkeymanager.cpp +++ b/src/gui/kernel/qsoftkeymanager.cpp @@ -61,7 +61,7 @@ QString QSoftKeyManager::standardSoftKeyText(StandardSoftKey standardKey) QString softKeyText; switch (standardKey) { case OkSoftKey: - softKeyText = QSoftKeyManager::tr("Ok"); + softKeyText = QSoftKeyManager::tr("OK"); break; case SelectSoftKey: softKeyText = QSoftKeyManager::tr("Select"); diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp index e20aa25..d00a048 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -801,7 +801,7 @@ int QFontEngineFT::loadFlags(QGlyphSet *set, GlyphFormat format, int flags, if (set && set->outline_drawing) load_flags = FT_LOAD_NO_BITMAP; - if (default_hint_style == HintNone || (flags & HB_ShaperFlag_UseDesignMetrics) || set->outline_drawing) + if (default_hint_style == HintNone || (flags & HB_ShaperFlag_UseDesignMetrics) || (set && set->outline_drawing)) load_flags |= FT_LOAD_NO_HINTING; else load_flags |= load_target; diff --git a/src/gui/widgets/qdialogbuttonbox.cpp b/src/gui/widgets/qdialogbuttonbox.cpp index 6c29141..e6842b3 100644 --- a/src/gui/widgets/qdialogbuttonbox.cpp +++ b/src/gui/widgets/qdialogbuttonbox.cpp @@ -94,6 +94,7 @@ QT_BEGIN_NAMESPACE specifying their role. \snippet examples/dialogs/extension/finddialog.cpp 1 + \snippet examples/dialogs/extension/finddialog.cpp 6 Alternatively, QDialogButtonBox provides several standard buttons (e.g. OK, Cancel, Save) that you can use. They exist as flags so you can OR them together in the constructor. |