Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Merge commit '66878e6b158c26cb6e80eac30baa930276e66a7f'
- Loading branch information
Showing
41 changed files
with
4,736 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
0.99.0 | ||
0.99.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
maliit-*.pc | ||
maliitserver.h | ||
maliitserver.c | ||
maliitcontext.h | ||
maliitcontext.c | ||
maliitmarshallers.h | ||
maliitmarshallers.c | ||
Makefile.* | ||
*.stamp | ||
maliit/ | ||
reference/ | ||
Maliit-1.0.gir | ||
Maliit-1.0.typelib |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
# Use when a .pro file requires libmaliit-glib | ||
# The .pro file must define TOP_DIR to be a relative path | ||
# to the top-level source/build directory, and include config.pri | ||
|
||
LIBS += $$TOP_DIR/lib/$$maliitDynamicLib($${MALIIT_GLIB_LIB}) | ||
POST_TARGETDEPS += $$TOP_DIR/lib/$$maliitDynamicLib($${MALIIT_GLIB_LIB}) | ||
INCLUDEPATH += $$TOP_DIR | ||
|
||
CONFIG += link_pkgconfig | ||
PKGCONFIG += glib-2.0 gobject-2.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
<?xml version="1.0"?> | ||
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" | ||
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" | ||
[ | ||
<!ENTITY % local.common.attrib "xmlns:xi CDATA #FIXED 'http://www.w3.org/2003/XInclude'"> | ||
]> | ||
<book id="index"> | ||
<bookinfo> | ||
<title>Maliit Reference Manual</title> | ||
<releaseinfo> | ||
for Maliit 1.0. | ||
The latest version of this documentation can be found on-line at | ||
<ulink role="online-location" url="http://www.maliit.org/docs/maliit/index.html">http://www.maliit.org/docs/maliit/index.html</ulink>. | ||
</releaseinfo> | ||
</bookinfo> | ||
|
||
<chapter> | ||
<title>Maliit</title> | ||
<xi:include href="xml/maliitattributeextension.xml"/> | ||
<xi:include href="xml/maliitinputmethod.xml"/> | ||
<xi:include href="xml/maliitsettingsmanager.xml"/> | ||
<xi:include href="xml/maliitpluginsettings.xml"/> | ||
<xi:include href="xml/maliitsettingsentry.xml"/> | ||
<xi:include href="xml/maliitsettingdata.xml"/> | ||
|
||
</chapter> | ||
<chapter id="object-tree"> | ||
<title>Object Hierarchy</title> | ||
<xi:include href="xml/tree_index.sgml"/> | ||
</chapter> | ||
<index id="api-index-full"> | ||
<title>API Index</title> | ||
<xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include> | ||
</index> | ||
<index id="deprecated-api-index" role="deprecated"> | ||
<title>Index of deprecated API</title> | ||
<xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include> | ||
</index> | ||
|
||
<xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include> | ||
</book> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,87 @@ | ||
TOP_DIR = .. | ||
|
||
include(../config.pri) | ||
|
||
TEMPLATE=lib | ||
TARGET=dummy | ||
|
||
GOBJECTFILES += \ | ||
maliitattributeextension.c \ | ||
maliitattributeextension.h \ | ||
maliitinputmethod.c \ | ||
maliitinputmethod.h \ | ||
maliitsettingsmanager.c \ | ||
maliitsettingsmanager.h \ | ||
maliitsettingsentry.c \ | ||
maliitsettingsentry.h \ | ||
maliitpluginsettings.c \ | ||
maliitpluginsettings.h \ | ||
maliitsettingdata.c \ | ||
maliitsettingdata.h \ | ||
|
||
|
||
LIB_DIR = $$OUT_PWD/$$TOP_DIR/lib | ||
|
||
# The resulting html docs go into ./maliit, and the temporary build files to ./reference/ | ||
gtk_doc.name = gtk-doc | ||
gtk_doc.CONFIG += target_predeps no_link combine | ||
gtk_doc.output = $${OUT_PWD}/maliit/index.html | ||
gtk_doc.clean_commands = rm -rf $${OUT_PWD}/maliit $${OUT_PWD}/reference | ||
gtk_doc.input = GOBJECTFILES | ||
gtk_doc.commands += mkdir -p reference && | ||
gtk_doc.commands += cp $$PWD/maliit-sections.txt $$PWD/maliit-docs.xml $$OUT_PWD/reference && | ||
gtk_doc.commands += cd reference && | ||
gtk_doc.commands += gtkdoc-scan --module=maliit --source-dir=$${PWD} --rebuild-types && | ||
gtk_doc.commands += LD_LIBRARY_PATH=\"$${LIB_DIR}\" CFLAGS=\"$$system(pkg-config --cflags gio-2.0)\" LDFLAGS=\"-L$${LIB_DIR} -l$${MALIIT_GLIB_LIB} $$system(pkg-config --libs gio-2.0)\" | ||
gtk_doc.commands += gtkdoc-scangobj --module=maliit && | ||
gtk_doc.commands += gtkdoc-mkdb --module=maliit --source-dir=$${PWD} --output-format=xml && cd .. && | ||
gtk_doc.commands += mkdir -p maliit && cd maliit && gtkdoc-mkhtml maliit ../reference/maliit-docs.xml && cd .. && | ||
gtk_doc.commands += cd reference && gtkdoc-fixxref --module=maliit --module-dir=../maliit && cd .. | ||
|
||
gir_scanner.name = g-ir-scanner | ||
gir_scanner.CONFIG += no_link combine | ||
gir_scanner.output = $${OUT_PWD}/Maliit-1.0.gir | ||
gir_scanner.input = GOBJECTFILES | ||
gir_scanner.commands += LD_LIBRARY_PATH=\"$${LIB_DIR}\" g-ir-scanner --warn-all -n Maliit --no-libtool -L$${LIB_DIR} --library=maliit-glib --include=Gio-2.0 --pkg=gio-2.0 --pkg-export=maliit-glib-1.0 --nsversion=1.0 --output=${QMAKE_FILE_OUT} ${QMAKE_FILE_IN} | ||
|
||
GIR_FILES = $${OUT_PWD}/Maliit-1.0.gir | ||
|
||
gir_compiler.name = g-ir-compiler | ||
gir_compiler.CONFIG += target_predeps no_link no_check_exist | ||
gir_compiler.output = $${OUT_PWD}/Maliit-1.0.typelib | ||
gir_compiler.input = GIR_FILES | ||
gir_compiler.commands += g-ir-compiler -m Maliit --output=${QMAKE_FILE_OUT} ${QMAKE_FILE_IN} | ||
|
||
system(pkg-config gtk-doc) { | ||
docs.files = $${OUT_PWD}/maliit | ||
docs.path = $$DATADIR/gtk-doc/html | ||
docs.CONFIG += no_check_exist directory | ||
|
||
INSTALLS += docs | ||
|
||
QMAKE_EXTRA_COMPILERS += gtk_doc | ||
} | ||
|
||
system(pkg-config gobject-introspection-1.0) { | ||
GIR_DIR = $$system(pkg-config --variable=girdir gobject-introspection-1.0) | ||
TYPELIB_DIR = $$system(pkg-config --variable=typelibdir gobject-introspection-1.0) | ||
GIR_PREFIX = $$system(pkg-config --variable=prefix gobject-introspection-1.0) | ||
local-install { | ||
GIR_DIR = $$replace(GIR_DIR, $$GIR_PREFIX, $$PREFIX) | ||
TYPELIB_DIR = $$replace(TYPELIB_DIR, $$GIR_PREFIX, $$PREFIX) | ||
} | ||
|
||
gir.files = $${OUT_PWD}/Maliit-1.0.gir | ||
gir.path = $$GIR_DIR | ||
gir.CONFIG += no_check_exist | ||
|
||
typelib.files = $${OUT_PWD}/Maliit-1.0.typelib | ||
typelib.path = $$TYPELIB_DIR | ||
typelib.CONFIG += no_check_exist | ||
|
||
INSTALLS += gir typelib | ||
|
||
QMAKE_EXTRA_COMPILERS += gir_scanner gir_compiler | ||
} | ||
|
||
OTHER_FILES += maliit-sections.txt maliit-docs.xml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
prefix=@PREFIX@ | ||
exec_prefix=@PREFIX@ | ||
libdir=@LIBDIR@ | ||
includedir=@INCLUDEDIR@ | ||
|
||
Name: Maliit-GLib | ||
Description: Maliit provides a flexible and cross platform input method framework. It is usable on all MeeGo user experiences, and in other GNU/Linux distributions as well. | ||
Version: @MALIIT_VERSION@ | ||
Requires: maliit-framework gobject-2.0 gio-2.0 | ||
Cflags: -I${includedir}/@MALIIT_HEADER@ | ||
Libs: -L${libdir} -l@MALIIT_GLIB_LIB@ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,102 @@ | ||
TOP_DIR = .. | ||
|
||
include(../config.pri) | ||
|
||
VERSION = $$MALIIT_ABI_VERSION | ||
TEMPLATE = lib | ||
TARGET = $$TOP_DIR/lib/$${MALIIT_GLIB_LIB} | ||
|
||
CONFIG += link_pkgconfig | ||
PKGCONFIG += glib-2.0 gobject-2.0 gio-2.0 gio-unix-2.0 | ||
|
||
CONFIG -= qt | ||
|
||
include($$TOP_DIR/connection-glib/libmaliit-connection-glib.pri) | ||
|
||
QMAKE_CXXFLAGS_DEBUG+=-Wno-error=deprecated-declarations | ||
QMAKE_CFLAGS_DEBUG+=-Wno-error=deprecated-declarations | ||
|
||
HEADERSINSTALL += \ | ||
maliitattributeextension.h \ | ||
maliitattributeextensionregistry.h \ | ||
maliitinputmethod.h \ | ||
maliitsettingsmanager.h \ | ||
maliitsettingsentry.h \ | ||
maliitpluginsettings.h \ | ||
maliitsettingdata.h \ | ||
maliitbus.h \ | ||
maliitserver.h \ | ||
maliitcontext.h \ | ||
|
||
HEADERS += \ | ||
$$HEADERSINSTALL \ | ||
maliitattributeextensionprivate.h \ | ||
maliitmarshallers.h \ | ||
maliitpluginsettingsprivate.h \ | ||
maliitsettingsentryprivate.h \ | ||
|
||
SOURCES += \ | ||
maliitattributeextension.c \ | ||
maliitattributeextensionregistry.c \ | ||
maliitinputmethod.c \ | ||
maliitsettingsmanager.c \ | ||
maliitsettingsentry.c \ | ||
maliitpluginsettings.c \ | ||
maliitsettingdata.c \ | ||
maliitbus.c \ | ||
maliitserver.c \ | ||
maliitcontext.c \ | ||
|
||
target.path += $$LIBDIR | ||
|
||
headers.path += $$INCLUDEDIR/$$MALIIT_HEADER/maliit-glib | ||
headers.files += $$HEADERSINSTALL | ||
|
||
outputFiles(maliit-glib.pc) | ||
|
||
OTHER_FILES += \ | ||
maliit-glib.pc.in | ||
|
||
install_pkgconfig.path = $${LIBDIR}/pkgconfig | ||
install_pkgconfig.files = $$OUT_PWD/maliit-glib.pc | ||
|
||
INSTALLS += \ | ||
target \ | ||
headers \ | ||
install_pkgconfig \ | ||
|
||
# coverage flags are off per default, but can be turned on via qmake COV_OPTION=on | ||
for(OPTION,$$list($$lower($$COV_OPTION))){ | ||
isEqual(OPTION, on){ | ||
QMAKE_CFLAGS += -ftest-coverage -fprofile-arcs -fno-elide-constructors | ||
LIBS += -lgcov | ||
} | ||
} | ||
|
||
QMAKE_CLEAN += \ | ||
$$OBJECTS_DIR/*.gcno \ | ||
$$OBJECTS_DIR/*.gcda \ | ||
maliitmarshallers.h \ | ||
maliitmarshallers.c | ||
|
||
OTHER_FILES += \ | ||
libmaliit-glib.pri | ||
|
||
# generate marshallers | ||
GLIB_GENMARSHAL_LIST += maliitmarshallers.list | ||
|
||
OTHER_FILES += maliitmarshallers.list | ||
|
||
glib_genmarshal_header.name = glib-genmarshal header ${QMAKE_FILE_IN} | ||
glib_genmarshal_header.commands = glib-genmarshal --prefix=maliit_marshal --header --g-fatal-warnings ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} | ||
glib_genmarshal_header.output = ${QMAKE_FILE_IN_BASE}.h | ||
glib_genmarshal_header.variable_out = HEADERS | ||
glib_genmarshal_header.input = GLIB_GENMARSHAL_LIST | ||
|
||
glib_genmarshal_source.name = glib-genmarshal source ${QMAKE_FILE_IN} | ||
glib_genmarshal_source.commands = glib-genmarshal --prefix=maliit_marshal --body --g-fatal-warnings ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} | ||
glib_genmarshal_source.output = ${QMAKE_FILE_IN_BASE}.c | ||
glib_genmarshal_source.variable_out = SOURCES | ||
glib_genmarshal_source.input = GLIB_GENMARSHAL_LIST | ||
|
||
QMAKE_EXTRA_COMPILERS += glib_genmarshal_header glib_genmarshal_source |
Oops, something went wrong.