Merge lp://staging/~thomas-moenicke/phablet-extras/maliit-framework-0.99-server into lp://staging/phablet-extras/maliit-framework
Proposed by
Thomas Moenicke
Status: | Merged |
---|---|
Merged at revision: | 1558 |
Proposed branch: | lp://staging/~thomas-moenicke/phablet-extras/maliit-framework-0.99-server |
Merge into: | lp://staging/phablet-extras/maliit-framework |
Diff against target: |
70264 lines (+5263/-45361) 542 files modified
NEWS (+75/-2) README (+2/-2) VERSION (+1/-1) common/maliit/namespace.h (+8/-132) config.pri (+8/-28) connection-glib/.gitignore (+0/-2) connection-glib/connection-glib.pro (+0/-98) connection-glib/debug.c (+0/-21) connection-glib/debug.h (+0/-18) connection-glib/libmaliit-connection-glib.pri (+0/-12) connection-glib/maliitmarshalers.list (+0/-9) connection-glib/meego-im-connector-private.h (+0/-25) connection-glib/meego-im-connector.c (+0/-260) connection-glib/meego-im-connector.h (+0/-28) connection-glib/meego-im-proxy.c (+0/-468) connection-glib/meego-im-proxy.h (+0/-109) connection-glib/meego-imcontext-dbus-private.h (+0/-56) connection-glib/meego-imcontext-dbus.c (+0/-443) connection-glib/meego-imcontext-dbus.h (+0/-55) connection-glib/qt-keysym-map.cpp (+0/-542) connection-glib/qt-keysym-map.h (+0/-14) connection/.gitignore (+0/-5) connection/connection.pro (+32/-216) connection/connectionfactory.cpp (+4/-87) connection/connectionfactory.h (+0/-17) connection/dbuscustomarguments.cpp (+26/-0) connection/dbuscustomarguments.h (+5/-0) connection/dbusinputcontextconnection.cpp (+15/-9) connection/dbusserverconnection.cpp (+16/-10) connection/dbusserverconnection.h (+5/-5) connection/glibdbusimserverproxy.cpp (+0/-461) connection/glibdbusimserverproxy.h (+0/-104) connection/glibdbusimserverproxy_p.h (+0/-57) connection/input-method.xml (+0/-160) connection/inputcontextdbusaddress.cpp (+2/-2) connection/inputcontextdbusaddress.h (+1/-1) connection/libmaliit-connection.pri (+11/-3) connection/maliit-connection.pc.in (+0/-15) connection/maliitmarshalers.list (+0/-1) connection/mdbusglibinputcontextadaptor.cpp (+0/-250) connection/mdbusglibinputcontextadaptor.h (+0/-47) connection/mimdirectserverconnection.cpp (+0/-140) connection/mimdirectserverconnection.h (+0/-80) connection/miminputcontextdirectconnection.cpp (+0/-142) connection/miminputcontextdirectconnection.h (+0/-71) connection/mimserverconnection.cpp (+6/-7) connection/mimserverconnection.h (+9/-24) connection/minputcontextconnection.cpp (+33/-29) connection/minputcontextconnection.h (+6/-6) connection/minputcontextglibdbusconnection.cpp (+0/-851) connection/minputcontextglibdbusconnection.h (+0/-112) connection/minputcontextwestonimprotocolconnection.cpp (+0/-830) connection/minputcontextwestonimprotocolconnection.h (+0/-97) connection/org.maliit.server.service.in (+0/-4) connection/serverdbusaddress.cpp (+1/-41) connection/serverdbusaddress.h (+1/-17) connection/text.xml (+0/-266) connection/variantmarshalling.cpp (+0/-231) connection/variantmarshalling.h (+0/-58) connection/waylandinputmethodconnection.cpp (+593/-0) connection/waylandinputmethodconnection.h (+61/-0) dbus_interfaces/dbus_interfaces.pri (+1/-1) dbus_interfaces/minputmethodcontext1interface.xml (+3/-3) dbus_interfaces/minputmethodserver1interface.xml (+1/-1) debian/changelog (+0/-278) debian/compat (+0/-1) debian/control (+0/-84) debian/copyright (+0/-17) debian/gir1.2-maliit-glib1.install (+0/-2) debian/libmaliit-glib1-dev.install (+0/-6) debian/libmaliit-glib1-doc.install (+0/-4) debian/libmaliit-glib1.install (+0/-1) debian/libmaliit1-dev.install (+0/-5) debian/libmaliit1.install (+0/-2) debian/maliit-framework-dev.install (+0/-12) debian/maliit-framework-doc.install (+0/-5) debian/maliit-framework-examples.install (+0/-1) debian/maliit-framework-tests.install (+0/-2) debian/maliit-framework.install (+0/-7) debian/maliit-framework.postinst (+0/-21) debian/maliit-framework.prerm (+0/-18) debian/maliit-inputcontext-gtk2.install (+0/-1) debian/maliit-inputcontext-gtk3.install (+0/-1) debian/rules (+0/-97) debian/server.conf (+0/-20) debian/source/format (+0/-1) debian/xinput/maliit (+0/-8) defines.pri (+0/-4) doc/doc.pro (+3/-3) examples/README (+0/-11) examples/apps/allinputmethods/.gitignore (+0/-1) examples/apps/allinputmethods/allinputmethods.cpp (+0/-25) examples/apps/allinputmethods/allinputmethods.pro (+0/-44) examples/apps/allinputmethods/mainwindow.cpp (+0/-71) examples/apps/allinputmethods/mainwindow.h (+0/-22) examples/apps/apps.pro (+0/-32) examples/apps/embedded/.gitignore (+0/-1) examples/apps/embedded/embedded.cpp (+0/-51) examples/apps/embedded/embedded.h (+0/-22) examples/apps/embedded/embedded.pro (+0/-47) examples/apps/embedded/main.cpp (+0/-32) examples/apps/gtk2-overrides/.gitignore (+0/-1) examples/apps/gtk2-overrides/actionkeyfilter.c (+0/-190) examples/apps/gtk2-overrides/actionkeyfilter.h (+0/-55) examples/apps/gtk2-overrides/gtk2-overrides.pro (+0/-30) examples/apps/gtk2-overrides/main.c (+0/-247) examples/apps/gtk2/.gitignore (+0/-1) examples/apps/gtk2/exampleapp-gtk.c (+0/-106) examples/apps/gtk2/gtk2.pro (+0/-29) examples/apps/gtk3-overrides/.gitignore (+0/-1) examples/apps/gtk3-overrides/gtk3-overrides.pro (+0/-30) examples/apps/gtk3-python/gtk3-python.pro (+0/-14) examples/apps/gtk3-python/maliit-exampleapp-gtk3-python.py (+0/-34) examples/apps/gtk3/.gitignore (+0/-1) examples/apps/gtk3/gtk3.pro (+0/-29) examples/apps/plainqt/.gitignore (+0/-2) examples/apps/plainqt/mainwindow.cpp (+0/-249) examples/apps/plainqt/mainwindow.h (+0/-50) examples/apps/plainqt/plainqt.cpp (+0/-32) examples/apps/plainqt/plainqt.pro (+0/-46) examples/apps/qml/enterKeyCustomization.qml (+18/-0) examples/apps/server-embedded/.gitignore (+0/-1) examples/apps/server-embedded/main.cpp (+0/-78) examples/apps/server-embedded/server-embedded.pro (+0/-40) examples/apps/settings-python3/maliit-exampleapp-settings-python3.py (+0/-361) examples/apps/settings-python3/settings-python3.pro (+0/-16) examples/apps/settings/.gitignore (+0/-1) examples/apps/settings/boolentrycheckbox.cpp (+0/-55) examples/apps/settings/boolentrycheckbox.h (+0/-42) examples/apps/settings/main.cpp (+0/-42) examples/apps/settings/mainwindow.cpp (+0/-295) examples/apps/settings/mainwindow.h (+0/-67) examples/apps/settings/selectentrycombobox.cpp (+0/-60) examples/apps/settings/selectentrycombobox.h (+0/-43) examples/apps/settings/settings.pro (+0/-50) examples/apps/settings/stringentryedit.cpp (+0/-46) examples/apps/settings/stringentryedit.h (+0/-42) examples/apps/twofields/.gitignore (+0/-1) examples/apps/twofields/actionkeyfilter.cpp (+0/-77) examples/apps/twofields/actionkeyfilter.h (+0/-31) examples/apps/twofields/mainwindow.cpp (+0/-93) examples/apps/twofields/mainwindow.h (+0/-22) examples/apps/twofields/myextension.cpp (+0/-26) examples/apps/twofields/myextension.h (+0/-26) examples/apps/twofields/twofields.cpp (+0/-25) examples/apps/twofields/twofields.pro (+0/-46) examples/apps/widgetproperties/.gitignore (+0/-1) examples/apps/widgetproperties/mainwindow.cpp (+0/-137) examples/apps/widgetproperties/mainwindow.h (+0/-24) examples/apps/widgetproperties/widgetproperties.cpp (+0/-25) examples/apps/widgetproperties/widgetproperties.pro (+0/-42) examples/examples.pro (+0/-2) examples/plugins/cxx/cxx.pro (+0/-2) examples/plugins/cxx/helloworld/helloworld.pro (+0/-50) examples/plugins/cxx/helloworld/helloworldinputmethod.cpp (+0/-210) examples/plugins/cxx/helloworld/helloworldinputmethod.h (+0/-85) examples/plugins/cxx/helloworld/helloworldplugin.cpp (+0/-45) examples/plugins/cxx/helloworld/helloworldplugin.h (+0/-51) examples/plugins/cxx/override/override.pro (+0/-50) examples/plugins/cxx/override/overrideinputmethod.cpp (+0/-259) examples/plugins/cxx/override/overrideinputmethod.h (+0/-91) examples/plugins/cxx/override/overrideplugin.cpp (+0/-45) examples/plugins/cxx/override/overrideplugin.h (+0/-51) examples/plugins/plugins.pro (+0/-11) examples/plugins/qml/.gitignore (+0/-1) examples/plugins/qml/cyclekeys/CycleKey.qml (+0/-123) examples/plugins/qml/cyclekeys/cyclekeys.pro (+0/-50) examples/plugins/qml/cyclekeys/cyclekeys.qrc (+0/-6) examples/plugins/qml/cyclekeys/cyclekeysplugin.cpp (+0/-41) examples/plugins/qml/cyclekeys/cyclekeysplugin.h (+0/-35) examples/plugins/qml/cyclekeys/main.qml (+0/-65) examples/plugins/qml/helloworld/helloworld.pro (+0/-44) examples/plugins/qml/helloworld/helloworld.qml (+0/-54) examples/plugins/qml/override/override.pro (+0/-48) examples/plugins/qml/override/override.qml (+0/-89) examples/plugins/qml/override/override.qrc (+0/-5) examples/plugins/qml/override/overrideplugin.cpp (+0/-43) examples/plugins/qml/override/overrideplugin.h (+0/-34) examples/plugins/qml/qml.pro (+0/-2) gtk-input-context/.gitignore (+0/-28) gtk-input-context/AUTHORS (+0/-3) gtk-input-context/COPYING (+0/-505) gtk-input-context/client-gtk/client-gtk.pro (+0/-71) gtk-input-context/client-gtk/client-imcontext-gtk.c (+0/-924) gtk-input-context/client-gtk/client-imcontext-gtk.h (+0/-81) gtk-input-context/client-gtk/gtk-imcontext-plugin.c (+0/-87) gtk-input-context/client-gtk/qt-gtk-translate.cpp (+0/-155) gtk-input-context/client-gtk/qt-gtk-translate.h (+0/-34) gtk-input-context/client-gtk3/client-gtk3.pro (+0/-75) gtk-input-context/gtk-input-context.pro (+0/-11) input-context/.gitignore (+0/-1) input-context/direct-input-context-plugin/direct-input-context-plugin.pro (+0/-18) input-context/direct-input-context-plugin/mdirectinputcontextplugin.cpp (+0/-104) input-context/direct-input-context-plugin/mdirectinputcontextplugin.h (+0/-37) input-context/input-context-plugin/input-context-plugin.pro (+0/-18) input-context/input-context-plugin/libmaliit-qt4.pri (+0/-9) input-context/input-context-plugin/minputcontextplugin.cpp (+0/-84) input-context/input-context-plugin/minputcontextplugin.h (+0/-37) input-context/input-context.pri (+0/-32) input-context/input-context.pro (+0/-19) input-context/libmaliit-inputcontext-qt4.pri (+0/-7) input-context/main.cpp (+41/-0) input-context/maliit-input-context/maliit-input-context.pro (+0/-13) input-context/maliit-input-context/minputcontext.cpp (+0/-1275) input-context/maliit-input-context/minputcontext.h (+0/-224) input-context/maliit.json (+3/-0) input-context/minputcontext.cpp (+789/-0) input-context/minputcontext.h (+143/-0) maliit-framework.pro (+17/-47) maliit-glib/.gitignore (+0/-9) maliit-glib/libmaliit-glib.pri (+0/-10) maliit-glib/maliit-docs.xml (+0/-41) maliit-glib/maliit-glib-docs.pro (+0/-87) maliit-glib/maliit-glib.pc.in (+0/-11) maliit-glib/maliit-glib.pro (+0/-96) maliit-glib/maliit-sections.txt (+0/-174) maliit-glib/maliitattributeextension.c (+0/-462) maliit-glib/maliitattributeextension.h (+0/-93) maliit-glib/maliitattributeextensionprivate.h (+0/-36) maliit-glib/maliitattributeextensionregistry.c (+0/-347) maliit-glib/maliitattributeextensionregistry.h (+0/-94) maliit-glib/maliitinputmethod.c (+0/-214) maliit-glib/maliitinputmethod.h (+0/-78) maliit-glib/maliitmarshallers.list (+0/-4) maliit-glib/maliitpluginsettings.c (+0/-370) maliit-glib/maliitpluginsettings.h (+0/-76) maliit-glib/maliitpluginsettingsprivate.h (+0/-37) maliit-glib/maliitsettingdata.c (+0/-252) maliit-glib/maliitsettingdata.h (+0/-88) maliit-glib/maliitsettingsentry.c (+0/-677) maliit-glib/maliitsettingsentry.h (+0/-92) maliit-glib/maliitsettingsentryprivate.h (+0/-37) maliit-glib/maliitsettingsmanager.c (+0/-383) maliit-glib/maliitsettingsmanager.h (+0/-76) maliit-plugins-quick/input-method/.gitignore (+0/-2) maliit-plugins-quick/input-method/input-method.pro (+0/-66) maliit-plugins-quick/input-method/maliit-plugins-quick.pc.in (+0/-12) maliit-plugins-quick/input-method/maliitquick.h (+0/-37) maliit-plugins-quick/input-method/minputmethodquick.cpp (+0/-491) maliit-plugins-quick/input-method/minputmethodquick.h (+0/-154) maliit-plugins-quick/input-method/minputmethodquickplugin.cpp (+0/-78) maliit-plugins-quick/input-method/minputmethodquickplugin.h (+0/-72) maliit-plugins-quick/input-method/mkeyoverridequick.cpp (+0/-351) maliit-plugins-quick/input-method/mkeyoverridequick.h (+0/-158) maliit-plugins-quick/input-method/mkeyoverridequick_p.h (+0/-44) maliit-plugins-quick/libmaliit-plugins-quick.pri (+0/-7) maliit-plugins-quick/maliit-plugins-quick.pro (+0/-5) maliit-plugins-quick/plugin-factory/libmaliit-plugins-quick-factory.pri (+0/-8) maliit-plugins-quick/plugin-factory/maliitquickpluginfactory.cpp (+0/-65) maliit-plugins-quick/plugin-factory/maliitquickpluginfactory.h (+0/-43) maliit-plugins-quick/plugin-factory/plugin-factory.pro (+0/-47) maliit-settings/.gitignore (+0/-1) maliit-settings/libmaliit-settings.pri (+0/-10) maliit-settings/maliit-settings.pc.in (+0/-11) maliit-settings/maliit-settings.pro (+0/-61) maliit-settings/pluginsettings.cpp (+0/-77) maliit-settings/pluginsettings.h (+0/-67) maliit-settings/settingsentry.cpp (+0/-112) maliit-settings/settingsentry.h (+0/-93) maliit-settings/settingsmanager.cpp (+0/-114) maliit-settings/settingsmanager.h (+0/-79) maliit/.gitignore (+0/-1) maliit/attributeextension.cpp (+0/-150) maliit/attributeextension.h (+0/-124) maliit/attributeextension_p.h (+0/-48) maliit/attributeextensionregistry.cpp (+0/-205) maliit/attributeextensionregistry.h (+0/-85) maliit/attributeextensionregistry_p.h (+0/-38) maliit/inputmethod.cpp (+0/-179) maliit/inputmethod.h (+0/-165) maliit/inputmethod_p.h (+0/-50) maliit/libmaliit.pri (+0/-9) maliit/maliit.pc.in (+0/-11) maliit/maliit.pro (+0/-65) maliit/preeditinjectionevent.cpp (+0/-117) maliit/preeditinjectionevent.h (+0/-96) maliit/preeditinjectionevent_p.h (+0/-36) passthroughserver/main.cpp (+78/-119) passthroughserver/passthroughserver.pro (+1/-1) src/.gitignore (+0/-7) src/abstractplatform.cpp (+28/-0) src/abstractplatform.h (+40/-0) src/abstractsurfacegroup.cpp (+0/-28) src/abstractsurfacegroup.h (+0/-47) src/abstractsurfacegroupfactory.cpp (+0/-24) src/abstractsurfacegroupfactory.h (+0/-35) src/config.h.in (+0/-25) src/desktop-shell.xml (+0/-131) src/libmaliit-plugins.pri (+0/-7) src/maliit-defines.prf.in (+0/-7) src/maliit-plugins.pc.in (+0/-15) src/maliit-plugins.prf.in (+0/-3) src/maliit-server.pc.in (+0/-15) src/maliit/plugins/abstractinputmethod.cpp (+0/-190) src/maliit/plugins/abstractinputmethod.h (+0/-272) src/maliit/plugins/abstractinputmethodhost.cpp (+0/-81) src/maliit/plugins/abstractinputmethodhost.h (+0/-325) src/maliit/plugins/abstractpluginfactory.cpp (+0/-25) src/maliit/plugins/abstractpluginfactory.h (+0/-58) src/maliit/plugins/abstractpluginsetting.h (+0/-70) src/maliit/plugins/abstractsurface.cpp (+0/-25) src/maliit/plugins/abstractsurface.h (+0/-111) src/maliit/plugins/abstractsurfacefactory.cpp (+0/-32) src/maliit/plugins/abstractsurfacefactory.h (+0/-71) src/maliit/plugins/abstractwidgetssurface.cpp (+0/-29) src/maliit/plugins/abstractwidgetssurface.h (+0/-78) src/maliit/plugins/attributeextension.cpp (+0/-51) src/maliit/plugins/attributeextension.h (+0/-62) src/maliit/plugins/attributeextension_p.h (+0/-37) src/maliit/plugins/extensionevent.cpp (+0/-44) src/maliit/plugins/extensionevent.h (+0/-56) src/maliit/plugins/extensionevent_p.h (+0/-27) src/maliit/plugins/inputmethodplugin.h (+0/-66) src/maliit/plugins/keyoverride.cpp (+0/-142) src/maliit/plugins/keyoverride.h (+0/-153) src/maliit/plugins/keyoverride_p.h (+0/-40) src/maliit/plugins/keyoverridedata.cpp (+0/-56) src/maliit/plugins/keyoverridedata.h (+0/-68) src/maliit/plugins/plugindescription.cpp (+0/-82) src/maliit/plugins/plugindescription.h (+0/-65) src/maliit/plugins/quickviewsurface.cpp (+0/-11) src/maliit/plugins/quickviewsurface.h (+0/-22) src/maliit/plugins/subviewdescription.cpp (+0/-89) src/maliit/plugins/subviewdescription.h (+0/-63) src/maliit/plugins/testsurfacefactory.cpp (+0/-80) src/maliit/plugins/testsurfacefactory.h (+0/-33) src/maliit/plugins/updateevent.cpp (+0/-112) src/maliit/plugins/updateevent.h (+0/-82) src/maliit/plugins/updateevent_p.h (+0/-43) src/maliit/plugins/updatereceiver.cpp (+0/-91) src/maliit/plugins/updatereceiver.h (+0/-75) src/mattributeextensionid.cpp (+0/-70) src/mattributeextensionid.h (+0/-72) src/mattributeextensionmanager.cpp (+0/-294) src/mattributeextensionmanager.h (+0/-171) src/mimabstractserverlogic.cpp (+0/-52) src/mimabstractserverlogic.h (+0/-59) src/mimapphostedserverlogic.cpp (+0/-99) src/mimapphostedserverlogic.h (+0/-48) src/mimdummyinputcontext.cpp (+0/-39) src/mimdummyinputcontext.h (+0/-40) src/mimhwkeyboardtracker.cpp (+0/-234) src/mimhwkeyboardtracker.h (+0/-62) src/mimhwkeyboardtracker_p.h (+0/-65) src/mimhwkeyboardtracker_stub.cpp (+48/-0) src/mimonscreenplugins.cpp (+0/-247) src/mimonscreenplugins.h (+0/-90) src/mimpluginmanager.cpp (+0/-1790) src/mimpluginmanager.h (+0/-197) src/mimpluginmanager_p.h (+0/-231) src/mimpluginsproxywidget.cpp (+0/-41) src/mimpluginsproxywidget.h (+0/-35) src/mimremotewindow.cpp (+0/-293) src/mimremotewindow.h (+0/-111) src/mimrotationanimation.cpp (+0/-497) src/mimrotationanimation.h (+0/-178) src/mimserver.cpp (+0/-104) src/mimserver.h (+0/-61) src/mimserveroptions.cpp (+0/-495) src/mimserveroptions.h (+0/-91) src/mimsettings.cpp (+0/-142) src/mimsettings.h (+0/-260) src/mimsettingsqsettings.cpp (+0/-200) src/mimsettingsqsettings.h (+0/-78) src/mimstandaloneserverlogic.cpp (+0/-76) src/mimstandaloneserverlogic.h (+0/-58) src/mimsubviewoverride.cpp (+0/-31) src/mimsubviewoverride.h (+0/-40) src/mimxapplication.cpp (+0/-39) src/mimxapplication.h (+0/-30) src/mimxerrortrap.cpp (+0/-79) src/mimxerrortrap.h (+0/-56) src/mimxextension.cpp (+0/-68) src/mimxextension.h (+0/-80) src/mimxserverlogic.cpp (+0/-263) src/mimxserverlogic.h (+0/-103) src/mindicatorserviceclient.cpp (+0/-27) src/mindicatorserviceclient.h (+0/-46) src/minputmethodhost.cpp (+0/-266) src/minputmethodhost.h (+0/-116) src/mpassthruwindow.cpp (+0/-238) src/mpassthruwindow.h (+0/-74) src/msharedattributeextensionmanager.cpp (+0/-112) src/msharedattributeextensionmanager.h (+0/-85) src/quick/inputmethodquick.cpp (+644/-0) src/quick/inputmethodquick.h (+229/-0) src/quick/inputmethodquickplugin.cpp (+84/-0) src/quick/inputmethodquickplugin.h (+65/-0) src/quick/keyoverridequick.cpp (+350/-0) src/quick/keyoverridequick.h (+164/-0) src/quick/keyoverridequick_p.h (+49/-0) src/quick/maliitquick.h (+60/-0) src/quickviewsurfacefactory.cpp (+0/-204) src/quickviewsurfacefactory.h (+0/-34) src/quickviewsurfacefactory_p.h (+0/-63) src/quickviewsurfacegroup.cpp (+0/-56) src/quickviewsurfacegroup.h (+0/-43) src/src.pro (+0/-248) src/unknownplatform.cpp (+35/-0) src/unknownplatform.h (+33/-0) src/waylandplatform.cpp (+222/-0) src/waylandplatform.h (+44/-0) src/windowdata.cpp (+29/-0) src/windowdata.h (+39/-0) src/windowedsurface.cpp (+0/-693) src/windowedsurface.h (+0/-75) src/windowedsurface_p.h (+0/-93) src/windowedsurfacefactory_p.h (+0/-78) src/windowedsurfacegroup.cpp (+0/-99) src/windowedsurfacegroup.h (+0/-54) src/windowgroup.cpp (+176/-0) src/windowgroup.h (+78/-0) src/xcbplatform.cpp (+129/-0) src/xcbplatform.h (+34/-0) tests/.gitignore (+0/-4) tests/bbt_connection/.gitignore (+0/-1) tests/bbt_connection/bbt_connection.cpp (+0/-299) tests/bbt_connection/bbt_connection.h (+0/-77) tests/bbt_connection/bbt_connection.pro (+0/-16) tests/common_check.pri (+0/-32) tests/common_top.pri (+0/-39) tests/dummyimplugin/dummyimplugin.cpp (+0/-30) tests/dummyimplugin/dummyimplugin.h (+0/-36) tests/dummyimplugin/dummyimplugin.pro (+0/-47) tests/dummyimplugin/dummyinputmethod.cpp (+0/-99) tests/dummyimplugin/dummyinputmethod.h (+0/-50) tests/dummyimplugin2/dummyimplugin2.cpp (+0/-27) tests/dummyimplugin2/dummyimplugin2.h (+0/-30) tests/dummyimplugin2/dummyimplugin2.pro (+0/-36) tests/dummyimplugin3/dummyimplugin3.cpp (+0/-31) tests/dummyimplugin3/dummyimplugin3.h (+0/-37) tests/dummyimplugin3/dummyimplugin3.pro (+0/-43) tests/dummyimplugin3/dummyinputmethod3.cpp (+0/-98) tests/dummyimplugin3/dummyinputmethod3.h (+0/-52) tests/dummyimplugins.pri (+0/-11) tests/dummyplugin/dummyplugin.cpp (+0/-13) tests/dummyplugin/dummyplugin.h (+0/-31) tests/dummyplugin/dummyplugin.pro (+0/-36) tests/ft_exampleplugin/.gitignore (+0/-1) tests/ft_exampleplugin/ft_exampleplugin.cpp (+0/-81) tests/ft_exampleplugin/ft_exampleplugin.h (+0/-37) tests/ft_exampleplugin/ft_exampleplugin.pro (+0/-20) tests/ft_mimpluginmanager/.gitignore (+0/-1) tests/ft_mimpluginmanager/ft_mimpluginmanager.cpp (+0/-336) tests/ft_mimpluginmanager/ft_mimpluginmanager.h (+0/-33) tests/ft_mimpluginmanager/ft_mimpluginmanager.pro (+0/-25) tests/qtestlib2junitxml.xsl (+0/-82) tests/sanitychecks/.gitignore (+0/-1) tests/sanitychecks/sanitychecks.cpp (+0/-56) tests/sanitychecks/sanitychecks.h (+0/-46) tests/sanitychecks/sanitychecks.pro (+0/-10) tests/stubs/fakeproperty.cpp (+0/-46) tests/stubs/fakeproperty.h (+0/-52) tests/stubs/mkeyboardstatetracker_stub.h (+0/-100) tests/tests.pro (+0/-74) tests/ut_maliit_attributeextension/.gitignore (+0/-1) tests/ut_maliit_attributeextension/ut_maliit_attributeextension.cpp (+0/-157) tests/ut_maliit_attributeextension/ut_maliit_attributeextension.pro (+0/-7) tests/ut_maliit_attributeextensionregistry/.gitignore (+0/-1) tests/ut_maliit_attributeextensionregistry/ut_maliit_attributeextensionregistry.cpp (+0/-104) tests/ut_maliit_attributeextensionregistry/ut_maliit_attributeextensionregistry.pro (+0/-7) tests/ut_maliit_glib_settings/.gitignore (+0/-1) tests/ut_maliit_glib_settings/mockmaliitserver.c (+0/-90) tests/ut_maliit_glib_settings/mockmaliitserver.h (+0/-42) tests/ut_maliit_glib_settings/ut_maliit_glib_settings.c (+0/-205) tests/ut_maliit_glib_settings/ut_maliit_glib_settings.pro (+0/-12) tests/ut_maliit_inputmethod/.gitignore (+0/-1) tests/ut_maliit_inputmethod/ut_maliit_inputmethod.cpp (+0/-211) tests/ut_maliit_inputmethod/ut_maliit_inputmethod.pro (+0/-9) tests/ut_maliit_settings/.gitignore (+0/-1) tests/ut_maliit_settings/ut_maliit_settings.cpp (+0/-218) tests/ut_maliit_settings/ut_maliit_settings.pro (+0/-7) tests/ut_mattributeextensionmanager/.gitignore (+0/-1) tests/ut_mattributeextensionmanager/toolbar1.xml (+0/-51) tests/ut_mattributeextensionmanager/toolbar2.xml (+0/-33) tests/ut_mattributeextensionmanager/ut_mattributeextensionmanager.cpp (+0/-113) tests/ut_mattributeextensionmanager/ut_mattributeextensionmanager.h (+0/-38) tests/ut_mattributeextensionmanager/ut_mattributeextensionmanager.pro (+0/-20) tests/ut_mimapplication/.gitignore (+0/-1) tests/ut_mimapplication/ut_mimapplication.cpp (+0/-91) tests/ut_mimapplication/ut_mimapplication.h (+0/-38) tests/ut_mimapplication/ut_mimapplication.pro (+0/-19) tests/ut_mimonscreenplugins/.gitignore (+0/-1) tests/ut_mimonscreenplugins/ut_mimonscreenplugins.cpp (+0/-126) tests/ut_mimonscreenplugins/ut_mimonscreenplugins.h (+0/-35) tests/ut_mimonscreenplugins/ut_mimonscreenplugins.pro (+0/-11) tests/ut_mimpluginmanager/.gitignore (+0/-1) tests/ut_mimpluginmanager/toolbar1.xml (+0/-51) tests/ut_mimpluginmanager/toolbar2.xml (+0/-31) tests/ut_mimpluginmanager/ut_mimpluginmanager.cpp (+0/-950) tests/ut_mimpluginmanager/ut_mimpluginmanager.h (+0/-68) tests/ut_mimpluginmanager/ut_mimpluginmanager.pro (+0/-25) tests/ut_mimpluginmanagerconfig/.gitignore (+0/-1) tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.cpp (+0/-189) tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.h (+0/-53) tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.pro (+0/-23) tests/ut_mimrotationanimation/.gitignore (+0/-1) tests/ut_mimrotationanimation/ut_mimrotationanimation.cpp (+0/-71) tests/ut_mimrotationanimation/ut_mimrotationanimation.h (+0/-41) tests/ut_mimrotationanimation/ut_mimrotationanimation.pro (+0/-18) tests/ut_mimserveroptions/.gitignore (+0/-2) tests/ut_mimserveroptions/ut_mimserveroptions.cpp (+0/-150) tests/ut_mimserveroptions/ut_mimserveroptions.h (+0/-43) tests/ut_mimserveroptions/ut_mimserveroptions.pro (+0/-12) tests/ut_mimsettings/.gitignore (+0/-1) tests/ut_mimsettings/ut_mimsettings.cpp (+0/-237) tests/ut_mimsettings/ut_mimsettings.h (+0/-40) tests/ut_mimsettings/ut_mimsettings.pro (+0/-13) tests/ut_minputcontext/.gitignore (+0/-2) tests/ut_minputcontext/ut_minputcontext.cpp (+0/-899) tests/ut_minputcontext/ut_minputcontext.h (+0/-185) tests/ut_minputcontext/ut_minputcontext.pro (+0/-19) tests/ut_minputcontextplugin/.gitignore (+0/-1) tests/ut_minputcontextplugin/ut_minputcontextplugin.cpp (+0/-102) tests/ut_minputcontextplugin/ut_minputcontextplugin.h (+0/-40) tests/ut_minputcontextplugin/ut_minputcontextplugin.pro (+0/-24) tests/ut_minputmethodquickplugin/.gitignore (+0/-2) tests/ut_minputmethodquickplugin/ut_minputmethodquickplugin.cpp (+0/-98) tests/ut_minputmethodquickplugin/ut_minputmethodquickplugin.h (+0/-42) tests/ut_minputmethodquickplugin/ut_minputmethodquickplugin.pro (+0/-30) tests/ut_mkeyoverride/.gitignore (+0/-1) tests/ut_mkeyoverride/ut_mkeyoverride.cpp (+0/-79) tests/ut_mkeyoverride/ut_mkeyoverride.h (+0/-28) tests/ut_mkeyoverride/ut_mkeyoverride.pro (+0/-17) tests/ut_passthroughserver/.gitignore (+0/-1) tests/ut_passthroughserver/ut_passthroughserver.cpp (+0/-68) tests/ut_passthroughserver/ut_passthroughserver.h (+0/-38) tests/ut_passthroughserver/ut_passthroughserver.pro (+0/-16) tests/ut_selfcompositing/.gitignore (+0/-1) tests/ut_selfcompositing/ut_selfcompositing.cpp (+0/-53) tests/ut_selfcompositing/ut_selfcompositing.h (+0/-44) tests/ut_selfcompositing/ut_selfcompositing.pro (+0/-19) tests/utils/core-utils.cpp (+0/-138) tests/utils/core-utils.h (+0/-55) tests/utils/gui-utils.cpp (+0/-43) tests/utils/gui-utils.h (+0/-226) weston-protocols/.gitignore (+4/-0) weston-protocols/dummy.cpp (+2/-0) weston-protocols/input-method.xml (+273/-0) weston-protocols/libmaliit-weston-protocols.pri (+12/-0) weston-protocols/text.xml (+346/-0) weston-protocols/weston-protocols.pro (+27/-0) |
To merge this branch: | bzr merge lp://staging/~thomas-moenicke/phablet-extras/maliit-framework-0.99-server |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
Ubuntu Phablet Team | Pending | ||
Review via email: mp+171802@code.staging.launchpad.net |
Commit message
server update
Description of the change
server update
To post a comment you must log in.
FAILED: Continuous integration, rev:1561 jenkins. qa.ubuntu. com/job/ phablet- extras- maliit- framework- ci/20/ jenkins. qa.ubuntu. com/job/ phablet- extras- maliit- framework- saucy-armhf- ci/7 jenkins. qa.ubuntu. com/job/ phablet- extras- maliit- framework- saucy-armhf- ci/7/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ phablet- extras- maliit- framework- saucy-i386- ci/7/console
http://
Executed test runs:
SUCCESS: http://
deb: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ phablet- extras- maliit- framework- ci/20/rebuild
http://