diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-13 09:01:02 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-13 12:46:46 +0200 |
| commit | 511790fd1af1e2886a0e2e8dd4308099705cd815 (patch) | |
| tree | b42aee537a6103cd064f9f41ae2889b09b79fd23 /tests/manual/shortcuts | |
| parent | 1542d8881fc5ccbc5918cd4acbe4091ebbd24508 (diff) | |
| parent | cbe332405aa22257d432f1797b325f5e57007c20 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
config_help.txt
configure
mkspecs/features/uikit/sdk.prf
src/corelib/global/qhooks.cpp
src/corelib/io/qfilesystemwatcher.cpp
src/corelib/io/qlockfile_unix.cpp
src/corelib/tools/qalgorithms.h
src/gui/kernel/qwindowsysteminterface.h
src/gui/text/qtextdocument_p.cpp
src/network/access/access.pri
src/network/access/qnetworkaccessmanager.cpp
src/network/access/qnetworkreplynsurlconnectionimpl.mm
src/src.pro
src/testlib/qtestcase.cpp
src/widgets/kernel/qwidgetbackingstore_p.h
src/widgets/styles/qwindowscestyle.cpp
src/widgets/styles/qwindowsmobilestyle.cpp
tests/auto/corelib/io/qdiriterator/qdiriterator.pro
tests/auto/corelib/io/qfileinfo/qfileinfo.pro
tests/auto/gui/kernel/qwindow/BLACKLIST
tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
tools/configure/configureapp.cpp
Change-Id: Ibf7fb9c8cf263a810ade82f821345d0725c57c67
Diffstat (limited to 'tests/manual/shortcuts')
| -rw-r--r-- | tests/manual/shortcuts/main.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/tests/manual/shortcuts/main.cpp b/tests/manual/shortcuts/main.cpp index 91477d5146..55ade1040a 100644 --- a/tests/manual/shortcuts/main.cpp +++ b/tests/manual/shortcuts/main.cpp @@ -92,16 +92,20 @@ protected: QPushButton *b12 = new QPushButton(sq12.toString()); b12->setShortcut(sq12); - // LATIN SMALL LETTER O WITH STROKE - QKeySequence sq13(QString(QChar(ushort(0xf8)))); + QKeySequence sq13(Qt::ControlModifier + Qt::Key_BracketRight); QPushButton *b13 = new QPushButton(sq13.toString()); b13->setShortcut(sq13); - // CYRILLIC SMALL LETTER ZHE - QKeySequence sq14(QString(QChar(ushort(0x436)))); + // LATIN SMALL LETTER O WITH STROKE + QKeySequence sq14(QString(QChar(ushort(0xf8)))); QPushButton *b14 = new QPushButton(sq14.toString()); b14->setShortcut(sq14); + // CYRILLIC SMALL LETTER ZHE + QKeySequence sq15(QString(QChar(ushort(0x436)))); + QPushButton *b15 = new QPushButton(sq15.toString()); + b15->setShortcut(sq15); + QLabel *testPurpose = new QLabel(); testPurpose->setWordWrap(true); testPurpose->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Expanding); @@ -120,10 +124,11 @@ protected: layout->addWidget(b10); layout->addWidget(b11); layout->addWidget(b12); - layout->addWidget(new QLabel("Norwegian layout")); layout->addWidget(b13); - layout->addWidget(new QLabel("Russian layout")); + layout->addWidget(new QLabel("Norwegian layout")); layout->addWidget(b14); + layout->addWidget(new QLabel("Russian layout")); + layout->addWidget(b15); setLayout(layout); } |