lp:~michael-sheldon/ubuntu/utopic/maliit-framework/sync-with-upstream

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:ubuntu/utopic/maliit-framework

Ubuntu branches: Pending requested 2014-08-18

Diff: 7243 lines (+6928/-18)

27 files modified

.pc/0011-use-preedit-styling-only-when-preedit-exists.patch/src/quick/inputmethodquick.cpp (+644/-0)
.pc/0012-signal-effective-focus-change-if-focused-object-enables-disables-input.patch/input-context/minputcontext.cpp (+785/-0)
.pc/0012-signal-effective-focus-change-if-focused-object-enables-disables-input.patch/input-context/minputcontext.h (+143/-0)
.pc/0013-input-context-connection-activation-and-state-update.patch/input-context/minputcontext.cpp (+795/-0)
.pc/0014-only-allow-widget-state-changes-from-active-connection.patch/connection/minputcontextconnection.cpp (+557/-0)
.pc/0015-require-debug-mode-for-auto-repeat-not-supported-warning.patch/input-context/minputcontext.cpp (+804/-0)
.pc/0016-fix-crash-when-updating-preedit-with-no-focus-object.patch/input-context/minputcontext.cpp (+804/-0)
.pc/0017-expose-preedit-as-property.patch/input-context/minputcontext.cpp (+810/-0)
.pc/0017-expose-preedit-as-property.patch/input-context/minputcontext.h (+144/-0)
.pc/0018-use-qt-window-flag-for-maliit-windows.patch/src/windowgroup.cpp (+177/-0)
.pc/0019-avoid-better-sending-events-to-null-objects.patch/input-context/minputcontext.cpp (+823/-0)
.pc/applied-patches (+9/-0)
connection/minputcontextconnection.cpp (+3/-0)
debian/patches/0011-use-preedit-styling-only-when-preedit-exists.patch (+23/-0)
debian/patches/0012-signal-effective-focus-change-if-focused-object-enables-disables-input.patch (+59/-0)
debian/patches/0013-input-context-connection-activation-and-state-update.patch (+57/-0)
debian/patches/0014-only-allow-widget-state-changes-from-active-connection.patch (+16/-0)
debian/patches/0015-require-debug-mode-for-auto-repeat-not-supported-warning.patch (+15/-0)
debian/patches/0016-fix-crash-when-updating-preedit-with-no-focus-object.patch (+23/-0)
debian/patches/0017-expose-preedit-as-property.patch (+86/-0)
debian/patches/0018-use-qt-window-flag-for-maliit-windows.patch (+23/-0)
debian/patches/0019-avoid-better-sending-events-to-null-objects.patch (+48/-0)
debian/patches/series (+9/-0)
input-context/minputcontext.cpp (+57/-13)
input-context/minputcontext.h (+8/-0)
src/quick/inputmethodquick.cpp (+2/-2)
src/windowgroup.cpp (+4/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1354189: /usr/lib/arm-linux-gnueabihf/qt5/bin/qmlscene:11:QCoreApplication::notifyInternal:MInputContext::updatePreeditInternally:MInputContext::updatePreedit:MInputContext::qt_static_metacall:QMetaObject::activate

Critical

Fix Released

Link a bug report

Related blueprints

18. By Michael Sheldon on 2014-08-15

Sync with upstream HEAD

17. By Ricardo Salveti on 2014-08-04

[ Michael Sheldon ]
0010-fix-building-with-g++-4.9.patch: g++ 4.9 introduces a new check for
unused functions that we wish to ignore to avoid removing upstream code

16. By Timo Jyrinki on 2014-06-02

[ Timo Jyrinki ]
* Rebuild against Qt 5.3.

[ ultraviolet ]
* Add 0008-qt5.3-fix.patch:
  - Fix building against Qt 5.3 (LP: #1323962)

15. By Ricardo Salveti on 2014-04-11

No-change rebuild for shlib changes in qtbase and qtdeclarative.

14. By Łukasz Zemczak on 2014-02-27

Bump the Qt dependency to 5.2, change the mkspecs install path as required
by the new Qt version (LP: #1279235).

13. By Daniel d'Andrada on 2014-01-31

Fix mapping between screen orientations and rotation angles. (LP: #1251330)

12. By Timo Jyrinki on 2014-01-24

Modify xvfb command to successfully pass tests (LP: #1272249)

11. By Dmitry Shachnev on 2014-01-24

[ Timo Jyrinki ]
Remove hard-coded dependency on libqt5core5 (LP: #1270720).

10. By Ricardo Salveti on 2013-08-21

Removing server.conf so the framework can use whatever is defined by
default. If a keyboard wants to replace the default behavior, it can
replace the system-wide config or make it per-user.

9. By Iain Lane on 2013-07-25

* Add missing Replaces/Breaks from libmaliit-plugins0 to maliit-framework
  due to file move. (LP: #1204543)
* Restore some packaging bits that were dropped when the packaging was
  rewritten from dh to cdbs in the previous upload.
  - --fail-missing
  - Run the testsuite
* Don't build-depend or use quilt explicitly. This is a 3.0 (quilt) package.
* Make transitional packages Arch: all and remove strict versioned deps.