← Back to branch summary

~timo-jyrinki/ubuntu/trusty/maliit-framework/fix_qt52

~timo-jyrinki/ubuntu/trusty/maliit-framework/fix_qt52

« back to all changes in this revision

Viewing changes to input-context/maliit-input-context/maliit-input-context.pro

Committer: Package Import Robot
Author(s): Ricardo Salveti de Araujo
Date: 2013-07-23 19:47:04 UTC
mto: This revision was merged to the branch mainline in revision 8.
Revision ID: package-import@ubuntu.com-20130723194704-0o18p2ao0x9sa1zx

Tags: upstream-0.99.0+git20130615+97e8335

Import upstream version 0.99.0+git20130615+97e8335

files added:
connection/waylandinputmethodconnection.cpp

connection/waylandinputmethodconnection.h

examples/apps/qml

examples/apps/qml/enterKeyCustomization.qml

input-context/main.cpp

input-context/maliit.json

input-context/minputcontext.cpp

input-context/minputcontext.h

src/abstractplatform.cpp

src/abstractplatform.h

src/mimhwkeyboardtracker_stub.cpp

src/quick

src/quick/inputmethodquick.cpp

src/quick/inputmethodquick.h

src/quick/inputmethodquickplugin.cpp

src/quick/inputmethodquickplugin.h

src/quick/keyoverridequick.cpp

src/quick/keyoverridequick.h

src/quick/keyoverridequick_p.h

src/quick/maliitquick.h

src/unknownplatform.cpp

src/unknownplatform.h

src/waylandplatform.cpp

src/waylandplatform.h

src/windowdata.cpp

src/windowdata.h

src/windowgroup.cpp

src/windowgroup.h

src/xcbplatform.cpp

src/xcbplatform.h

weston-protocols

weston-protocols/.gitignore

weston-protocols/dummy.cpp

weston-protocols/input-method.xml

weston-protocols/libmaliit-weston-protocols.pri

weston-protocols/text.xml

weston-protocols/weston-protocols.pro

files removed:
connection-glib

connection-glib/.gitignore

connection-glib/connection-glib.pro

connection-glib/debug.c

connection-glib/debug.h

connection-glib/libmaliit-connection-glib.pri

connection-glib/maliitmarshalers.list

connection-glib/meego-im-connector-private.h

connection-glib/meego-im-connector.c

connection-glib/meego-im-connector.h

connection-glib/meego-im-proxy.c

connection-glib/meego-im-proxy.h

connection-glib/meego-imcontext-dbus-private.h

connection-glib/meego-imcontext-dbus.c

connection-glib/meego-imcontext-dbus.h

connection-glib/qt-keysym-map.cpp

connection-glib/qt-keysym-map.h

connection/glibdbusimserverproxy.cpp

connection/glibdbusimserverproxy.h

connection/glibdbusimserverproxy_p.h

connection/input-method.xml

connection/maliit-connection.pc.in

connection/maliitmarshalers.list

connection/mdbusglibinputcontextadaptor.cpp

connection/mdbusglibinputcontextadaptor.h

connection/mimdirectserverconnection.cpp

connection/mimdirectserverconnection.h

connection/miminputcontextdirectconnection.cpp

connection/miminputcontextdirectconnection.h

connection/minputcontextglibdbusconnection.cpp

connection/minputcontextglibdbusconnection.h

connection/minputcontextwestonimprotocolconnection.cpp

connection/minputcontextwestonimprotocolconnection.h

connection/text.xml

connection/variantmarshalling.cpp

connection/variantmarshalling.h

examples/apps/allinputmethods

examples/apps/allinputmethods/.gitignore

examples/apps/allinputmethods/allinputmethods.cpp

examples/apps/allinputmethods/allinputmethods.pro

examples/apps/allinputmethods/mainwindow.cpp

examples/apps/allinputmethods/mainwindow.h

examples/apps/embedded

examples/apps/embedded/.gitignore

examples/apps/embedded/embedded.cpp

examples/apps/embedded/embedded.h

examples/apps/embedded/embedded.pro

examples/apps/embedded/main.cpp

examples/apps/gtk2

examples/apps/gtk2-overrides

examples/apps/gtk2-overrides/.gitignore

examples/apps/gtk2-overrides/actionkeyfilter.c

examples/apps/gtk2-overrides/actionkeyfilter.h

examples/apps/gtk2-overrides/gtk2-overrides.pro

examples/apps/gtk2-overrides/main.c

examples/apps/gtk2/.gitignore

examples/apps/gtk2/exampleapp-gtk.c

examples/apps/gtk2/gtk2.pro

examples/apps/gtk3

examples/apps/gtk3-overrides

examples/apps/gtk3-overrides/.gitignore

examples/apps/gtk3-overrides/gtk3-overrides.pro

examples/apps/gtk3-python

examples/apps/gtk3-python/gtk3-python.pro

examples/apps/gtk3-python/maliit-exampleapp-gtk3-python.py

examples/apps/gtk3/.gitignore

examples/apps/gtk3/gtk3.pro

examples/apps/server-embedded

examples/apps/server-embedded/.gitignore

examples/apps/server-embedded/main.cpp

examples/apps/server-embedded/server-embedded.pro

examples/apps/settings

examples/apps/settings-python3

examples/apps/settings-python3/maliit-exampleapp-settings-python3.py

examples/apps/settings-python3/settings-python3.pro

examples/apps/settings/.gitignore

examples/apps/settings/boolentrycheckbox.cpp

examples/apps/settings/boolentrycheckbox.h

examples/apps/settings/main.cpp

examples/apps/settings/mainwindow.cpp

examples/apps/settings/mainwindow.h

examples/apps/settings/selectentrycombobox.cpp

examples/apps/settings/selectentrycombobox.h

examples/apps/settings/settings.pro

examples/apps/settings/stringentryedit.cpp

examples/apps/settings/stringentryedit.h

examples/apps/twofields

examples/apps/twofields/.gitignore

examples/apps/twofields/actionkeyfilter.cpp

examples/apps/twofields/actionkeyfilter.h

examples/apps/twofields/mainwindow.cpp

examples/apps/twofields/mainwindow.h

examples/apps/twofields/myextension.cpp

examples/apps/twofields/myextension.h

examples/apps/twofields/twofields.cpp

examples/apps/twofields/twofields.pro

examples/apps/widgetproperties

examples/apps/widgetproperties/.gitignore

examples/apps/widgetproperties/mainwindow.cpp

examples/apps/widgetproperties/mainwindow.h

examples/apps/widgetproperties/widgetproperties.cpp

examples/apps/widgetproperties/widgetproperties.pro

gtk-input-context

gtk-input-context/.gitignore

gtk-input-context/AUTHORS

gtk-input-context/COPYING

gtk-input-context/client-gtk

gtk-input-context/client-gtk/client-gtk.pro

gtk-input-context/client-gtk/client-imcontext-gtk.c

gtk-input-context/client-gtk/client-imcontext-gtk.h

gtk-input-context/client-gtk/gtk-imcontext-plugin.c

gtk-input-context/client-gtk/qt-gtk-translate.cpp

gtk-input-context/client-gtk/qt-gtk-translate.h

gtk-input-context/client-gtk3

gtk-input-context/client-gtk3/client-gtk3.pro

gtk-input-context/gtk-input-context.pro

input-context/.gitignore

input-context/direct-input-context-plugin

input-context/direct-input-context-plugin/direct-input-context-plugin.pro

input-context/direct-input-context-plugin/mdirectinputcontextplugin.cpp

input-context/direct-input-context-plugin/mdirectinputcontextplugin.h

input-context/input-context-plugin

input-context/input-context-plugin/input-context-plugin.pro

input-context/input-context-plugin/libmaliit-qt4.pri

input-context/input-context-plugin/minputcontextplugin.cpp

input-context/input-context-plugin/minputcontextplugin.h

input-context/input-context.pri

input-context/libmaliit-inputcontext-qt4.pri

input-context/maliit-input-context

input-context/maliit-input-context/maliit-input-context.pro

input-context/maliit-input-context/minputcontext.cpp

input-context/maliit-input-context/minputcontext.h

maliit

maliit-glib

maliit-glib/.gitignore

maliit-glib/libmaliit-glib.pri

maliit-glib/maliit-docs.xml

maliit-glib/maliit-glib-docs.pro

maliit-glib/maliit-glib.pc.in

maliit-glib/maliit-glib.pro

maliit-glib/maliit-sections.txt

maliit-glib/maliitattributeextension.c

maliit-glib/maliitattributeextension.h

maliit-glib/maliitattributeextensionprivate.h

maliit-glib/maliitattributeextensionregistry.c

maliit-glib/maliitattributeextensionregistry.h

maliit-glib/maliitinputmethod.c

maliit-glib/maliitinputmethod.h

maliit-glib/maliitmarshallers.list

maliit-glib/maliitpluginsettings.c

maliit-glib/maliitpluginsettings.h

maliit-glib/maliitpluginsettingsprivate.h

maliit-glib/maliitsettingdata.c

maliit-glib/maliitsettingdata.h

maliit-glib/maliitsettingsentry.c

maliit-glib/maliitsettingsentry.h

maliit-glib/maliitsettingsentryprivate.h

maliit-glib/maliitsettingsmanager.c

maliit-glib/maliitsettingsmanager.h

maliit-plugins-quick

maliit-plugins-quick/input-method

maliit-plugins-quick/input-method/.gitignore

maliit-plugins-quick/input-method/input-method.pro

maliit-plugins-quick/input-method/maliit-plugins-quick.pc.in

maliit-plugins-quick/input-method/maliitquick.h

maliit-plugins-quick/input-method/minputmethodquick.cpp

maliit-plugins-quick/input-method/minputmethodquick.h

maliit-plugins-quick/input-method/minputmethodquickplugin.cpp

maliit-plugins-quick/input-method/minputmethodquickplugin.h

maliit-plugins-quick/input-method/mkeyoverridequick.cpp

maliit-plugins-quick/input-method/mkeyoverridequick.h

maliit-plugins-quick/input-method/mkeyoverridequick_p.h

maliit-plugins-quick/libmaliit-plugins-quick.pri

maliit-plugins-quick/maliit-plugins-quick.pro

maliit-plugins-quick/plugin-factory

maliit-plugins-quick/plugin-factory/libmaliit-plugins-quick-factory.pri

maliit-plugins-quick/plugin-factory/maliitquickpluginfactory.cpp

maliit-plugins-quick/plugin-factory/maliitquickpluginfactory.h

maliit-plugins-quick/plugin-factory/plugin-factory.json

maliit-plugins-quick/plugin-factory/plugin-factory.pro

maliit-settings

maliit-settings/.gitignore

maliit-settings/libmaliit-settings.pri

maliit-settings/maliit-settings.pc.in

maliit-settings/maliit-settings.pro

maliit-settings/pluginsettings.cpp

maliit-settings/pluginsettings.h

maliit-settings/settingsentry.cpp

maliit-settings/settingsentry.h

maliit-settings/settingsmanager.cpp

maliit-settings/settingsmanager.h

maliit/.gitignore

maliit/attributeextension.cpp

maliit/attributeextension.h

maliit/attributeextension_p.h

maliit/attributeextensionregistry.cpp

maliit/attributeextensionregistry.h

maliit/attributeextensionregistry_p.h

maliit/inputmethod.cpp

maliit/inputmethod.h

maliit/inputmethod_p.h

maliit/libmaliit.pri

maliit/maliit.pc.in

maliit/maliit.pro

maliit/preeditinjectionevent.cpp

maliit/preeditinjectionevent.h

maliit/preeditinjectionevent_p.h

src/abstractsurfacegroup.cpp

src/abstractsurfacegroup.h

src/abstractsurfacegroupfactory.cpp

src/abstractsurfacegroupfactory.h

src/desktop-shell.xml

src/maliit/plugins/abstractpluginfactory.cpp

src/maliit/plugins/abstractpluginfactory.h

src/maliit/plugins/abstractsurface.cpp

src/maliit/plugins/abstractsurface.h

src/maliit/plugins/abstractsurfacefactory.cpp

src/maliit/plugins/abstractsurfacefactory.h

src/maliit/plugins/abstractwidgetssurface.cpp

src/maliit/plugins/abstractwidgetssurface.h

src/maliit/plugins/quickviewsurface.cpp

src/maliit/plugins/quickviewsurface.h

src/maliit/plugins/testsurfacefactory.cpp

src/maliit/plugins/testsurfacefactory.h

src/mimabstractserverlogic.cpp

src/mimabstractserverlogic.h

src/mimapphostedserverlogic.cpp

src/mimapphostedserverlogic.h

src/mimdummyinputcontext.cpp

src/mimdummyinputcontext.h

src/mimpluginsproxywidget.cpp

src/mimpluginsproxywidget.h

src/mimremotewindow.cpp

src/mimremotewindow.h

src/mimrotationanimation.cpp

src/mimrotationanimation.h

src/mimstandaloneserverlogic.cpp

src/mimstandaloneserverlogic.h

src/mimxapplication.cpp

src/mimxapplication.h

src/mimxerrortrap.cpp

src/mimxerrortrap.h

src/mimxextension.cpp

src/mimxextension.h

src/mimxserverlogic.cpp

src/mimxserverlogic.h

src/mindicatorserviceclient.cpp

src/mindicatorserviceclient.h

src/mpassthruwindow.cpp

src/mpassthruwindow.h

src/quickviewsurfacefactory.cpp

src/quickviewsurfacefactory.h

src/quickviewsurfacefactory_p.h

src/quickviewsurfacegroup.cpp

src/quickviewsurfacegroup.h

src/windowedsurface.cpp

src/windowedsurface.h

src/windowedsurface_p.h

src/windowedsurfacefactory_p.h

src/windowedsurfacegroup.cpp

src/windowedsurfacegroup.h

tests/bbt_connection

tests/bbt_connection/.gitignore

tests/bbt_connection/bbt_connection.cpp

tests/bbt_connection/bbt_connection.h

tests/bbt_connection/bbt_connection.pro

tests/ut_maliit_attributeextension

tests/ut_maliit_attributeextension/.gitignore

tests/ut_maliit_attributeextension/ut_maliit_attributeextension.cpp

tests/ut_maliit_attributeextension/ut_maliit_attributeextension.pro

tests/ut_maliit_attributeextensionregistry

tests/ut_maliit_attributeextensionregistry/.gitignore

tests/ut_maliit_attributeextensionregistry/ut_maliit_attributeextensionregistry.cpp

tests/ut_maliit_attributeextensionregistry/ut_maliit_attributeextensionregistry.pro

tests/ut_maliit_glib_settings

tests/ut_maliit_glib_settings/.gitignore

tests/ut_maliit_glib_settings/mockmaliitserver.c

tests/ut_maliit_glib_settings/mockmaliitserver.h

tests/ut_maliit_glib_settings/ut_maliit_glib_settings.c

tests/ut_maliit_glib_settings/ut_maliit_glib_settings.pro

tests/ut_maliit_inputmethod

tests/ut_maliit_inputmethod/.gitignore

tests/ut_maliit_inputmethod/ut_maliit_inputmethod.cpp

tests/ut_maliit_inputmethod/ut_maliit_inputmethod.pro

tests/ut_maliit_settings

tests/ut_maliit_settings/.gitignore

tests/ut_maliit_settings/ut_maliit_settings.cpp

tests/ut_maliit_settings/ut_maliit_settings.pro

tests/ut_mimapplication

tests/ut_mimapplication/.gitignore

tests/ut_mimapplication/ut_mimapplication.cpp

tests/ut_mimapplication/ut_mimapplication.h

tests/ut_mimapplication/ut_mimapplication.pro

tests/ut_mimrotationanimation

tests/ut_mimrotationanimation/.gitignore

tests/ut_mimrotationanimation/ut_mimrotationanimation.cpp

tests/ut_mimrotationanimation/ut_mimrotationanimation.h

tests/ut_mimrotationanimation/ut_mimrotationanimation.pro

tests/ut_minputcontext

tests/ut_minputcontext/.gitignore

tests/ut_minputcontext/ut_minputcontext.cpp

tests/ut_minputcontext/ut_minputcontext.h

tests/ut_minputcontext/ut_minputcontext.pro

tests/ut_minputcontextplugin

tests/ut_minputcontextplugin/.gitignore

tests/ut_minputcontextplugin/ut_minputcontextplugin.cpp

tests/ut_minputcontextplugin/ut_minputcontextplugin.h

tests/ut_minputcontextplugin/ut_minputcontextplugin.pro

tests/ut_passthroughserver

tests/ut_passthroughserver/.gitignore

tests/ut_passthroughserver/ut_passthroughserver.cpp

tests/ut_passthroughserver/ut_passthroughserver.h

tests/ut_passthroughserver/ut_passthroughserver.pro

tests/ut_selfcompositing

tests/ut_selfcompositing/.gitignore

tests/ut_selfcompositing/ut_selfcompositing.cpp

tests/ut_selfcompositing/ut_selfcompositing.h

tests/ut_selfcompositing/ut_selfcompositing.pro

files modified:
NEWS

README

VERSION

common/maliit/namespace.h

config.pri

connection/.gitignore

connection/connection.pro

connection/connectionfactory.cpp

connection/connectionfactory.h

connection/dbuscustomarguments.cpp

connection/dbuscustomarguments.h

connection/dbusinputcontextconnection.cpp

connection/dbusserverconnection.cpp

connection/dbusserverconnection.h

connection/inputcontextdbusaddress.cpp

connection/inputcontextdbusaddress.h

connection/libmaliit-connection.pri

connection/mimserverconnection.cpp

connection/mimserverconnection.h

connection/minputcontextconnection.cpp

connection/minputcontextconnection.h

connection/serverdbusaddress.cpp

connection/serverdbusaddress.h

dbus_interfaces/minputmethodcontext1interface.xml

dbus_interfaces/minputmethodserver1interface.xml

defines.pri

examples/apps/apps.pro

examples/apps/plainqt/mainwindow.cpp

examples/apps/plainqt/mainwindow.h

examples/apps/plainqt/plainqt.cpp

examples/plugins/cxx/helloworld/helloworldinputmethod.cpp

examples/plugins/cxx/helloworld/helloworldinputmethod.h

examples/plugins/cxx/override/overrideinputmethod.cpp

examples/plugins/cxx/override/overrideinputmethod.h

examples/plugins/plugins.pro

examples/plugins/qml/cyclekeys/CycleKey.qml

examples/plugins/qml/cyclekeys/main.qml

examples/plugins/qml/helloworld/helloworld.qml

examples/plugins/qml/override/override.qml

examples/plugins/qml/qml.pro

input-context/input-context.pro

maliit-framework.pro

passthroughserver/main.cpp

passthroughserver/passthroughserver.pro

src/maliit-plugins.pc.in

src/maliit/plugins/abstractinputmethod.cpp

src/maliit/plugins/abstractinputmethod.h

src/maliit/plugins/abstractinputmethodhost.cpp

src/maliit/plugins/abstractinputmethodhost.h

src/mattributeextensionmanager.cpp

src/mimonscreenplugins.cpp

src/mimonscreenplugins.h

src/mimpluginmanager.cpp

src/mimpluginmanager.h

src/mimpluginmanager_p.h

src/mimserver.cpp

src/mimserver.h

src/mimserveroptions.cpp

src/mimserveroptions.h

src/mimsettingsqsettings.cpp

src/mimsettingsqsettings.h

src/minputmethodhost.cpp

src/minputmethodhost.h

src/src.pro

tests/dummyimplugin/dummyimplugin.h

tests/dummyimplugin/dummyimplugin.pro

tests/dummyimplugin/dummyinputmethod.h

tests/dummyimplugin2/dummyimplugin2.h

tests/dummyimplugin2/dummyimplugin2.pro

tests/dummyimplugin3/dummyimplugin3.h

tests/dummyimplugin3/dummyimplugin3.pro

tests/dummyimplugin3/dummyinputmethod3.h

tests/dummyplugin/dummyplugin.pro

tests/ft_exampleplugin/ft_exampleplugin.cpp

tests/ft_exampleplugin/ft_exampleplugin.pro

tests/ft_mimpluginmanager/ft_mimpluginmanager.cpp

tests/ft_mimpluginmanager/ft_mimpluginmanager.pro

tests/tests.pro

tests/ut_mattributeextensionmanager/ut_mattributeextensionmanager.cpp

tests/ut_mimonscreenplugins/ut_mimonscreenplugins.cpp

tests/ut_mimonscreenplugins/ut_mimonscreenplugins.h

tests/ut_mimpluginmanager/ut_mimpluginmanager.cpp

tests/ut_mimpluginmanager/ut_mimpluginmanager.h

tests/ut_mimpluginmanager/ut_mimpluginmanager.pro

tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.cpp

tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.pro

tests/ut_mimserveroptions/ut_mimserveroptions.cpp

tests/ut_mimserveroptions/ut_mimserveroptions.h

tests/ut_minputmethodquickplugin/ut_minputmethodquickplugin.cpp

tests/ut_minputmethodquickplugin/ut_minputmethodquickplugin.pro

tests/utils/core-utils.h

tests/utils/gui-utils.cpp

tests/utils/gui-utils.h

Show diffs side-by-side

added added

removed removed

input-context/maliit-input-context/maliit-input-context.pro

1

TOP_DIR = ../..

2

3

include(../input-context.pri)

4

5

CONFIG += staticlib

6

TARGET = $$TOP_DIR/lib/$$MALIIT_INPUTCONTEXT_TARGETNAME

7

8

# Input

9

HEADERS += minputcontext.h

10

11

SOURCES += minputcontext.cpp

12

13

target.path += $$LIBDIR

Older »