Compile with new xkbcommon API

Change-Id: Ie3f45a1e624cae3abb71d85c7ea8107b0f6b710c
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

1 files changed, 20 insertions, 9 deletions

diff --git a/config.tests/xkbcommon/main.cpp b/config.tests/xkbcommon/main.cpp
index 27422bf2d..9eb8506db 100644
--- a/config.tests/xkbcommon/main.cpp
+++ b/config.tests/xkbcommon/main.cpp
@@ -42,17 +42,28 @@
 #include <X11/keysym.h>
 
 #include <QtCore/qnamespace.h>
+#include <string.h>
 
-int main(int argc, char **argv)
+int main()
 {
-    struct xkb_rule_names names;
-    names.rules = "evdev";
-    names.model = "pc105";
-    names.layout = "us";
-    names.variant = "";
-    names.options = "";
+    xkb_rule_names names;
+    names.rules = strdup("evdev");
+    names.model = strdup("pc105");
+    names.layout = strdup("us");
+    names.variant = strdup("");
+    names.options = strdup("");
+
+    xkb_context *context = xkb_context_new();
+    if (context) {
+        xkb_keymap * keymap = xkb_map_new_from_names(context, &names);
+        if (keymap) {
+            xkb_state *state = xkb_state_new(keymap);
+            if (state)
+                xkb_state_unref(state);
+            xkb_map_unref(keymap);
+        }
+        xkb_context_unref(context);
+    }
 
-    struct xkb_desc *xkb = xkb_compile_keymap_from_rules(&names);
-    Q_UNUSED(xkb);
     return 0;
 }