Merge commit '873b9a9825ff02c81a3e80e0fd6687c5bccfceed'

sailfishos · Jul 21, 2015 · 58832eb · 58832eb
2 parents 807b9b0 + 873b9a9
commit 58832eb
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 14 deletions.
diff --git a/maliit-framework/connection/waylandinputmethodconnection.cpp b/maliit-framework/connection/waylandinputmethodconnection.cpp
@@ -465,7 +465,11 @@ namespace Maliit {
 namespace Wayland {
 
 InputMethod::InputMethod(MInputContextConnection *connection, struct wl_registry *registry, int id)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
+    : QtWayland::wl_input_method(registry, id, 1)
+#else
     : QtWayland::wl_input_method(registry, id)
+#endif
     , m_connection(connection)
     , m_context()
 {

diff --git a/maliit-framework/examples/apps/plainqt/mainwindow.cpp b/maliit-framework/examples/apps/plainqt/mainwindow.cpp
@@ -173,19 +173,10 @@ bool MainWindow::eventFilter(QObject *watched,
 
 void MainWindow::onStartServerClicked()
 {
-
-    QStringList arguments;
-    arguments << "-bypass-wm-hint";
-
-    // Self-compositing is currently only supported in fullscreen mode:
-    if (enableFullScreenMode()) {
-        arguments << "-use-self-composition";
-    }
-
     if (m_server_process->state() != QProcess::NotRunning) {
         m_server_process->terminate();
     } else {
-        m_server_process->start(serverName, arguments);
+        m_server_process->start(serverName, QStringList());
     }
 }
 

diff --git a/maliit-framework/passthroughserver/main.cpp b/maliit-framework/passthroughserver/main.cpp
@@ -70,6 +70,11 @@ void outputMessagesToStdErr(QtMsgType type,
             fprintf(stderr, "DEBUG: %s\n", raw);
         }
         break;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
+    case QtInfoMsg:
+        fprintf(stderr, "INFO: %s\n", raw);
+        break;
+#endif
     case QtWarningMsg:
         fprintf(stderr, "WARNING: %s\n", raw);
         break;

diff --git a/maliit-framework/src/maliit/plugins/updateevent.cpp b/maliit-framework/src/maliit/plugins/updateevent.cpp
@@ -39,7 +39,7 @@ bool MImUpdateEventPrivate::isFlagSet(Qt::InputMethodHint hint,
 
     if (update.contains(Maliit::Internal::inputMethodHints)) {
         const Qt::InputMethodHints hints(static_cast<Qt::InputMethodHints>(
-                                             update.value(Maliit::Internal::inputMethodHints).toLongLong()));
+                                             update.value(Maliit::Internal::inputMethodHints).toInt()));
 
         result = (hints & hint);
     }
@@ -90,7 +90,7 @@ Qt::InputMethodHints MImUpdateEvent::hints(bool *changed) const
 {
     Q_D(const MImUpdateEvent);
     return static_cast<Qt::InputMethodHints>(
-        d->extractProperty(Maliit::Internal::inputMethodHints, changed).toLongLong());
+        d->extractProperty(Maliit::Internal::inputMethodHints, changed).toInt());
 }
 
 bool MImUpdateEvent::westernNumericInputEnforced(bool *changed) const

diff --git a/maliit-framework/src/mimpluginmanager.cpp b/maliit-framework/src/mimpluginmanager.cpp
@@ -343,7 +343,12 @@ void MIMPluginManagerPrivate::setActiveHandlers(const QSet<Maliit::HandlerState>
 
     // notify plugins about new states
     Q_FOREACH (Maliit::Plugins::InputMethodPlugin *plugin, activatedPlugins) {
-        plugins.value(plugin).inputMethod->setState(plugins.value(plugin).state);
+        PluginDescription desc = plugins.value(plugin);
+        desc.inputMethod->setState(desc.state);
+        if (visible) {
+            desc.windowGroup->activate();
+            desc.inputMethod->show();
+        }
     }
 
     // deactivate unnecessary plugins
@@ -1493,7 +1498,7 @@ void MIMPluginManager::handleWidgetStateChanged(unsigned int clientId,
         }
     }
 
-    const Qt::InputMethodHints lastHints = static_cast<Qt::InputMethodHints>(newState.value(Maliit::Internal::inputMethodHints).toLongLong());
+    const Qt::InputMethodHints lastHints = static_cast<Qt::InputMethodHints>(newState.value(Maliit::Internal::inputMethodHints).toInt());
     MImUpdateEvent ev(newState, changedProperties, lastHints);
 
     // general notification last

diff --git a/maliit-framework/src/waylandplatform.cpp b/maliit-framework/src/waylandplatform.cpp
@@ -126,7 +126,11 @@ void WaylandPlatformPrivate::handleRegistryGlobal(uint32_t name,
 
     qDebug() << __PRETTY_FUNCTION__ << "Name:" << name << "Interface:" << interface;
     if (!strcmp(interface, "wl_input_panel")) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
+        m_panel.reset(new QtWayland::wl_input_panel(m_registry, name, 1));
+#else
         m_panel.reset(new QtWayland::wl_input_panel(m_registry, name));
+#endif
         m_panel_name = name;
 
         Q_FOREACH (const WindowData& data, m_scheduled_windows) {