Remove/update obsolete references, variables, documentation

RevBy: Jan Arne Petersen

Author: pvuorela

README

@@ -12,7 +12,7 @@ http://wiki.maliit.org/Plugins
 
 Installing
 
-Qt 4.7 must be installed to build the Maliit framework. At a terminal, run:
+Qt5 must be installed to build the Maliit framework. At a terminal, run:
 
 qmake
 make
@@ -30,7 +30,7 @@ export GTK_IM_MODULE=Maliit
 
 Start the server:
 
-maliit-server -software -bypass-wm-hint
+maliit-server
 
 Note that a compositing window manager and a D-Bus session bus are required to
 use Maliit.

config.pri

@@ -1,21 +1,12 @@
 MALIIT_VERSION = $$system(cat $$PWD/VERSION)
 
-MALIIT_INTERFACE_VERSION = 1.0
-MALIIT_PLUGINS_INTERFACE_VERSION = 1.0
-MALIIT_PLUGINS_QUICK_INTERFACE_VERSION = 0.80
-MALIIT_FRAMEWORK_INTERFACE_VERSION = 0.80
-MALIIT_CONNECTION_INTERFACE_VERSION = 0.80
-MALIIT_SERVER_INTERFACE_VERSION = 0.80
 MALIIT_ABI_VERSION = $$MALIIT_VERSION
 
 # For libmaliit
 MALIIT_LIB = maliit
 MALIIT_SETTINGS_LIB = maliit-settings
 MALIIT_HEADER = maliit
 MALIIT_FRAMEWORK_HEADER = maliit/framework
-# For libmaliit-glib
-MALIIT_CONNECTION_GLIB_LIB = maliit-connection-glib
-MALIIT_GLIB_LIB = maliit-glib
 
 include(defines.pri)
 
@@ -199,7 +190,6 @@ defineTest(outputFile) {
                 MALIIT_CONNECTION_LIB \
                 MALIIT_SERVER_HEADER \
                 MALIIT_ABI_VERSION_MAJOR \
-                MALIIT_GLIB_LIB \
 
     command = "sed"
     for(var, variables) {

connection/.gitignore

@@ -1,8 +1,5 @@
 org.maliit.server.service
 minputmethodserver.service
-mdbusglibicconnectionserviceglue.h
-mdbusglibinputcontextadaptorglue.h
-maliit-connection.pc
 minputmethodcontext1interface_adaptor.cpp
 minputmethodcontext1interface_adaptor.h
 minputmethodcontext1interface_interface.cpp

maliit-framework.pro

@@ -14,7 +14,6 @@ include(./config.pri)
         \\n\\t enable-dbus-activation : Enable dbus activation support for maliit-server \
         \\n\\t notests : Do not build tests \
         \\n\\t nodoc : Do not build documentation\
-        \\n\\t disable-gtk-cache-update : Do not update GTK2/3 input method caches (used for packaging) \
         \\n\\t local-install : Install everything underneath PREFIX, nothing to system directories reported by GTK+, Qt, DBus etc. \
         \\n\\t wayland : Compile with support for wayland \
         \\nInfluential environment variables: \

src/mimserveroptions.cpp

@@ -50,9 +50,7 @@ namespace {
         { "-qdebug",         false },
         { "-software",       false },
         { "-qws",            false },
-        { "-sync",           false },
-        // Next parameter is used by Harmattan and we should silently ingore it
-        { "-remote-theme",   false }
+        { "-sync",           false }
     };
 
     const char * programName = "meego-im-uiserver";

tests/ut_mimserveroptions/ut_mimserveroptions.cpp

@@ -42,7 +42,7 @@ namespace {
                            "-graphicssystem", "GRAPHICSSYSTEM",
                           "-testability", "TESTABILITY", "-qdevel", "-reverse",
                           "-stylesheet", "-widgetcount", "-qdebug",
-                          "-software", "-remote-theme" } };
+                          "-software" } };
 
     bool operator==(const MImServerCommonOptions &x,
                     const MImServerCommonOptions &y)