diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-05-29 10:06:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-05-29 10:54:41 +0200 |
| commit | 6a772fd201ac738dc86e71bd82e98f65158e6335 (patch) | |
| tree | 674007720f41d27b251bbcffd7a368a93f88eb96 /examples | |
| parent | 40206a9f6d7635bb19305d1c8d74908808e3529e (diff) | |
| parent | 4c346b6e2bfab976bc9b16275b8382aee38aefa4 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
mkspecs/common/msvc-desktop.conf
mkspecs/win32-g++/qmake.conf
mkspecs/win32-icc/qmake.conf
src/platformsupport/fontdatabases/mac/coretext.pri
src/plugins/platforms/cocoa/qcocoawindow.h
src/plugins/platforms/cocoa/qcocoawindow.mm
Change-Id: I74a6f7705c9547ed8bbac7260eb4645543e32655
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/network/googlesuggest/googlesuggest.cpp | 2 | ||||
| -rw-r--r-- | examples/widgets/doc/src/icons.qdoc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/examples/network/googlesuggest/googlesuggest.cpp b/examples/network/googlesuggest/googlesuggest.cpp index a4ae9d9fe8..9fdfd8faa6 100644 --- a/examples/network/googlesuggest/googlesuggest.cpp +++ b/examples/network/googlesuggest/googlesuggest.cpp @@ -117,11 +117,13 @@ bool GSuggestCompletion::eventFilter(QObject *obj, QEvent *ev) case Qt::Key_Return: doneCompletion(); consumed = true; + break; case Qt::Key_Escape: editor->setFocus(); popup->hide(); consumed = true; + break; case Qt::Key_Up: case Qt::Key_Down: diff --git a/examples/widgets/doc/src/icons.qdoc b/examples/widgets/doc/src/icons.qdoc index 42d823975b..60cb9062c2 100644 --- a/examples/widgets/doc/src/icons.qdoc +++ b/examples/widgets/doc/src/icons.qdoc @@ -98,8 +98,8 @@ The application allows you to manipulate the icon size with some predefined sizes and a spin box. The predefined sizes are style - dependent, but most of the styles have the same values: Only the - Macintosh style differ by using 32 pixels, instead of 16 pixels, + dependent, but most of the styles have the same values. Only the + \macos style differs by using 32 pixels instead of 16 pixels for toolbar buttons. You can navigate between the available styles using the \uicontrol View menu. |