Viewing all changes in revision 12.3.3.
- Committer: Michael Terry
- Date: 2013-11-04 17:48:55 UTC
- mfrom: (96 trunk)
- mto: This revision was merged to the branch mainline in revision 97.
- Revision ID: michael.terry@canonical.com-20131104174855-mtmwbdavrq77nl1r
Merge from trunk
- files added:
- data/schemas
- qml/images
- qml/keys
- qml/languages
- qml/languages/de
- qml/languages/en
- qml/languages/es
- qml/languages/fr
- qml/languages/pt
- qml/languages/zh_cn
- tests/autopilot
- tests/autopilot/ubuntu_keyboard
- tests/autopilot/ubuntu_keyboard/emulators
- tests/autopilot/ubuntu_keyboard/tests
- tests/manual
- tests/qmltests
- tests/qmltests/api-test
- tests/unittests/ut_dynamic-layout
- tests/unittests/ut_keyboardsettings
- tests/unittests/ut_text
- files removed:
- data/styles/gnome3
- data/styles/gnome3/images
- data/styles/gnome3/sounds
- data/styles/nokia-n9
- data/styles/nokia-n9-droid
- data/styles/nokia-n9-droid/images
- data/styles/nokia-n9-droid/sounds
- data/styles/nokia-n9/images
- data/styles/nokia-n9/sounds
- data/styles/olpc-xo
- data/styles/olpc-xo/images
- data/styles/olpc-xo/sounds
- tests/dynamic-layout
- tests/rendering
- files renamed:
- qml/LanguageMenu.qml => qml/keys/LanguageMenu.qml
- tests/unittests/unittests.pro => tests/qmltests/api-test/api-test.pro
- tests/unittests/api_tests.qml => tests/qmltests/api-test/api_tests.qml
- tests/qml-api-tests/ => tests/qmltests/qml-api-tests/
- tests/qml-test-app/ => tests/qmltests/qml-test-app/
- tests/common-check.pri => tests/unittests/common-check.pri
- tests/common/ => tests/unittests/common/
- tests/editor/ => tests/unittests/ut_editor/
- tests/editor/main.cpp => tests/unittests/ut_editor/ut_editor.cpp
- tests/editor/editor.pro => tests/unittests/ut_editor/ut_editor.pro
- tests/language-layout-loading/ => tests/unittests/ut_language-layout-loading/
- tests/language-layout-loading/main.cpp => tests/unittests/ut_language-layout-loading/ut_language-layout-loading.cpp
- tests/language-layout-loading/language-layout-loading.pro => tests/unittests/ut_language-layout-loading/ut_language-layout-loading.pro
- tests/language-layout-switching/ => tests/unittests/ut_language-layout-switching/
- tests/language-layout-switching/main.cpp => tests/unittests/ut_language-layout-switching/ut_language-layout-switching.cpp
- tests/language-layout-switching/language-layout-switching.pro => tests/unittests/ut_language-layout-switching/ut_language-layout-switching.pro
- tests/preedit-string/ => tests/unittests/ut_preedit-string/
- tests/preedit-string/main.cpp => tests/unittests/ut_preedit-string/ut_preedit-string.cpp
- tests/preedit-string/preedit-string.pro => tests/unittests/ut_preedit-string/ut_preedit-string.pro
- tests/repeat-backspace/ => tests/unittests/ut_repeat-backspace/
- tests/repeat-backspace/main.cpp => tests/unittests/ut_repeat-backspace/ut_repeat-backspace.cpp
- tests/repeat-backspace/repeat-backspace.pro => tests/unittests/ut_repeat-backspace/ut_repeat-backspace.pro
- tests/word-candidates/ => tests/unittests/ut_word-candidates/
- tests/word-candidates/main.cpp => tests/unittests/ut_word-candidates/ut_word-candidates.cpp
- tests/word-candidates/word-candidates.pro => tests/unittests/ut_word-candidates/ut_word-candidates.pro
- tests/wordengine/ => tests/unittests/ut_wordengine/
- tests/wordengine/main.cpp => tests/unittests/ut_wordengine/ut_wordengine.cpp
- tests/wordengine/wordengine.pro => tests/unittests/ut_wordengine/ut_wordengine.pro
- files modified:
- buildOnDevice.sh
expand all
collapse all
added
removed
data/styles/gnome3/images/background.png
data/styles/gnome3/images/backspace-icon.png
data/styles/gnome3/images/close-icon.png
data/styles/gnome3/images/extended-background.png
data/styles/gnome3/images/extended-key-background-pressed.png
data/styles/gnome3/images/extended-key-background.png
data/styles/gnome3/images/key-background-pressed.png
data/styles/gnome3/images/key-background-special.png
data/styles/gnome3/images/key-background.png
data/styles/gnome3/images/language-icon.png
data/styles/gnome3/images/magnifier-key-background.png
data/styles/gnome3/images/return-icon.png
data/styles/gnome3/images/shift-icon.png
data/styles/gnome3/images/shift-latched-icon.png
data/styles/gnome3/images/word-ribbon-background.png
data/styles/nokia-n9-droid/images/background.png
data/styles/nokia-n9-droid/images/backspace-icon.png
data/styles/nokia-n9-droid/images/close-icon.png
data/styles/nokia-n9-droid/images/extended-background.png
data/styles/nokia-n9-droid/images/extended-key-background-pressed.png
data/styles/nokia-n9-droid/images/extended-key-background.png
data/styles/nokia-n9-droid/images/key-background-pressed.png
data/styles/nokia-n9-droid/images/key-background-special.png
data/styles/nokia-n9-droid/images/key-background.png
data/styles/nokia-n9-droid/images/return-icon.png
data/styles/nokia-n9-droid/images/shift-icon.png
data/styles/nokia-n9-droid/images/shift-latched-icon.png
data/styles/nokia-n9/images/background.png
data/styles/nokia-n9/images/backspace-icon.png
data/styles/nokia-n9/images/close-icon.png
data/styles/nokia-n9/images/extended-background.png
data/styles/nokia-n9/images/extended-key-background-pressed.png
data/styles/nokia-n9/images/extended-key-background.png
data/styles/nokia-n9/images/key-background-pressed.png
data/styles/nokia-n9/images/key-background-special-pressed.png
data/styles/nokia-n9/images/key-background-special.png
data/styles/nokia-n9/images/key-background.png
data/styles/nokia-n9/images/language-icon.png
data/styles/nokia-n9/images/return-icon.png
data/styles/nokia-n9/images/shift-icon.png
data/styles/nokia-n9/images/shift-latched-icon.png
data/styles/nokia-n9/images/small-cut.png
data/styles/nokia-n9/images/small-square-smile.png
data/styles/nokia-n9/images/square-smile.png
data/styles/olpc-xo/images/background.png
data/styles/olpc-xo/images/backspace-icon.png
data/styles/olpc-xo/images/close-icon.png
data/styles/olpc-xo/images/extended-background.png
data/styles/olpc-xo/images/extended-key-background-pressed.png
data/styles/olpc-xo/images/extended-key-background.png
data/styles/olpc-xo/images/key-background-pressed.png
data/styles/olpc-xo/images/key-background-special-pressed.png
data/styles/olpc-xo/images/key-background-special.png
data/styles/olpc-xo/images/key-background.png
data/styles/olpc-xo/images/language-icon.png
data/styles/olpc-xo/images/return-icon.png
data/styles/olpc-xo/images/ribbon-background.png
data/styles/olpc-xo/images/shift-icon.png
data/styles/olpc-xo/images/shift-latched-icon.png
qml/images/action_key_bg@27.png
qml/images/b2.png
qml/images/border_bottom.png
qml/images/border_top.png
qml/images/icon_backspace@18.png
qml/images/icon_enter@18.png
qml/images/icon_shift@18.png
qml/images/icon_shift_upsidedown@18.png
qml/images/icon_shift_white@18.png
qml/images/key_bg@27.png
qml/images/keybg.png
qml/images/keybg@18.png
qml/images/keybg_action@18.png
qml/images/keybg_action_active@18.png
qml/images/keybg_capslock_bg@18.png
qml/images/keyboard_popover.png
qml/images/popover@27.png
qml/images/popover_tooltip@27.png
qml/images/rect3846.png
qml/images/tablet_icon_backspace@20.png
qml/images/tablet_icon_return@20.png
qml/images/tablet_icon_shift@20.png
qml/images/tablet_icon_shift_white@20.png
