diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2014-11-19 23:07:35 +0100 |
|---|---|---|
| committer | Zeno Albisser <zeno.albisser@digia.com> | 2015-01-20 08:34:17 +0100 |
| commit | 937d7b9c264d78433fc47832b66cd62640393b54 (patch) | |
| tree | acda363e8fa78adb5fb6ebaee0713c63c1724abe /tests/auto/quick/qmltests/qmltests.pro | |
| parent | e12f31e21f5397de0e208d81ea4e7d6d1408968c (diff) | |
Add Keyboard modifiers to MotionEventQt.
Also fix the mapping of Ctrl and Meta keys on Mac OSX.
On this platform Qt automatically maps Meta to Control
and vice versa. Chromium however does not expect such
behavior.
Change-Id: Ia9913322ae8ae6ffd99feb6edfc91b9ea752c5cb
Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
Diffstat (limited to 'tests/auto/quick/qmltests/qmltests.pro')
| -rw-r--r-- | tests/auto/quick/qmltests/qmltests.pro | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro index 33a864cf1..6789b714b 100644 --- a/tests/auto/quick/qmltests/qmltests.pro +++ b/tests/auto/quick/qmltests/qmltests.pro @@ -16,6 +16,8 @@ OTHER_FILES += \ $$PWD/data/test1.html \ $$PWD/data/test2.html \ $$PWD/data/test3.html \ + $$PWD/data/test4.html \ + $$PWD/data/keyboardModifierMapping.html \ $$PWD/data/tst_desktopBehaviorLoadHtml.qml \ $$PWD/data/tst_favIconLoad.qml \ $$PWD/data/tst_linkHovered.qml \ @@ -29,7 +31,9 @@ OTHER_FILES += \ $$PWD/data/tst_navigationRequested.qml \ $$PWD/data/tst_properties.qml \ $$PWD/data/tst_runJavaScript.qml \ - $$PWD/data/tst_titleChanged.qml + $$PWD/data/tst_titleChanged.qml \ + $$PWD/data/tst_keyboardModifierMapping.qml \ + load(qt_build_paths) DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$PWD$${QMAKE_DIR_SEP}data\\\"\" |