diff -Nru qt-at-spi-0.1.1+20120306/debian/changelog qt-at-spi-0.2.0/debian/changelog
--- qt-at-spi-0.1.1+20120306/debian/changelog	2012-03-07 22:34:32.000000000 +0000
+++ qt-at-spi-0.2.0/debian/changelog	2012-03-14 22:10:20.000000000 +0000
@@ -1,3 +1,15 @@
+qt-at-spi (0.2.0-0ubuntu1) precise; urgency=low
+
+  * New upstream bugfix release
+    - Fix introspection of root accessible.
+    - Use plastique style in test.
+    - Remove useless debug output.
+    - Improve shortcut handling.
+    - Not every line edit is a password one.
+    - Sent the right text for text insert/delete events.
+
+ -- Luke Yelavich <themuso@ubuntu.com>  Thu, 15 Mar 2012 09:10:17 +1100
+
 qt-at-spi (0.1.1+20120306-0ubuntu1) precise; urgency=low
 
   * New upstream bugfix snapshot (LP: #947641)
diff -Nru qt-at-spi-0.1.1+20120306/examples/simple/mainwindow.ui qt-at-spi-0.2.0/examples/simple/mainwindow.ui
--- qt-at-spi-0.1.1+20120306/examples/simple/mainwindow.ui	2012-03-05 13:34:16.000000000 +0000
+++ qt-at-spi-0.2.0/examples/simple/mainwindow.ui	2012-03-14 14:10:50.000000000 +0000
@@ -104,7 +104,10 @@
         <item row="4" column="3">
          <widget class="QPushButton" name="greetButton">
           <property name="text">
-           <string>Display greeting</string>
+           <string>Display &amp;greeting</string>
+          </property>
+          <property name="shortcut">
+           <string>Ctrl+G</string>
           </property>
          </widget>
         </item>
diff -Nru qt-at-spi-0.1.1+20120306/.gitignore qt-at-spi-0.2.0/.gitignore
--- qt-at-spi-0.1.1+20120306/.gitignore	2012-03-05 13:34:16.000000000 +0000
+++ qt-at-spi-0.2.0/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,118 +0,0 @@
-# This file is used to ignore files which are generated in the Qt build system
-# ----------------------------------------------------------------------------
-
-# binary app
-examples/calculator/calculator
-examples/simple/simple
-examples/declarative/declarative
-
-doc/html
-
-callgrind.out.*
-pcviewer.cfg
-*~
-*.a
-*.la
-*.core
-*.moc
-*.o
-*.obj
-*.orig
-*.swp
-*.rej
-*.so
-*.pbxuser
-*.mode1
-*.mode1v3
-*_pch.h.cpp
-*_resource.rc
-.#*
-*.*#
-core
-.qmake.cache
-.qmake.vars
-*.prl
-tags
-.DS_Store
-*.debug
-Makefile*
-!qmake/Makefile.win32*
-!qmake/Makefile.unix
-*.prl
-*.app
-*.pro.user*
-*.qmlproject.user
-*.gcov
-ui_*.h
-.com.apple.timemachine.supported
-.directory
-
-# Test generated files
-QObject.log
-tst_*
-!tst_*.*
-tst_*.log
-tst_*.debug
-tst_*~
-
-# xemacs temporary files
-*.flc
-
-# Vim temporary files
-.*.swp
-
-# Visual Studio generated files
-*.ib_pdb_index
-*.idb
-*.ilk
-*.pdb
-*.sln
-*.suo
-*.vcproj
-*vcproj.*.*.user
-*.ncb
-*.vcxproj
-*.vcxproj.filters
-*.vcxproj.user
-
-# MinGW generated files
-*.Debug
-*.Release
-
-# Symbian build system generated files
-# ---------------------
-
-ABLD.BAT
-bld.inf*
-*.mmp
-*.mk
-*.rss
-*.loc
-!s60main.rss
-*.pkg
-plugin_commonu.def
-*.qtplugin
-*.sis
-*.sisx
-*.lst
-*.exe
-*.mif
-*.rsc
-*.sym
-*.lib
-
-# runonphone crash dumps
-d_exc_*.txt
-d_exc_*.stk
-
-# Generated by abldfast.bat from devtools.
-.abldsteps.*
-
-# Carbide project files
-# ---------------------
-.project
-.cproject
-.make.cache
-*.d
-
-.pc/
diff -Nru qt-at-spi-0.1.1+20120306/src/atspiadaptor.cpp qt-at-spi-0.2.0/src/atspiadaptor.cpp
--- qt-at-spi-0.1.1+20120306/src/atspiadaptor.cpp	2012-03-05 13:34:16.000000000 +0000
+++ qt-at-spi-0.2.0/src/atspiadaptor.cpp	2012-03-14 14:10:50.000000000 +0000
@@ -554,17 +554,14 @@
                 "    </method>\n"
                 "  </interface>\n"
                 );
-    QPair<QAccessibleInterface*, int> pair;
 
-    if (path != QSPI_OBJECT_PATH_ROOT) {
-        QPair<QAIPointer, int> pair = interfaceFromPath(path);
-        if (!pair.first) {
-            qWarning() << "WARNING Qt AtSpiAdaptor: Could not find accessible on path: " << path;
-            return QString();
-        }
+    QPair<QAIPointer, int> pair = interfaceFromPath(path);
+    if (!pair.first) {
+        qWarning() << "WARNING Qt AtSpiAdaptor: Could not find accessible on path: " << path;
+        return QString();
     }
 
-    QStringList interfaces = accessibleInterfaces(pair.first, pair.second);
+    QStringList interfaces = accessibleInterfaces(pair.first.data(), pair.second);
 
     QString xml;
     xml.append(accessibleIntrospection);
@@ -988,13 +985,13 @@
 
             QDBusVariant data;
             data.setVariant(QVariant::fromValue(oldText));
-            QVariantList args = packDBusSignalArguments(QLatin1String("delete"), 0, oldText.length(), variantForPath(path));
+            QVariantList args = packDBusSignalArguments(QLatin1String("delete"), 0, oldText.length(), QVariant::fromValue(data));
             sendDBusSignal(path, QLatin1String(ATSPI_DBUS_INTERFACE_EVENT_OBJECT),
                            QLatin1String("TextChanged"), args);
 
             QString text = interface->textInterface()->text(0, interface->textInterface()->characterCount());
             data.setVariant(QVariant::fromValue(text));
-            args = packDBusSignalArguments(QLatin1String("insert"), 0, text.length(), variantForPath(path));
+            args = packDBusSignalArguments(QLatin1String("insert"), 0, text.length(), QVariant::fromValue(data));
             sendDBusSignal(path, QLatin1String(ATSPI_DBUS_INTERFACE_EVENT_OBJECT),
                            QLatin1String("TextChanged"), args);
 
@@ -1370,7 +1367,7 @@
 
 AtspiRole AtSpiAdaptor::getRole(QAccessibleInterface *interface, int child) const
 {
-    if (interface->role(child) == QAccessible::EditableText && interface->state(child) | QAccessible::Protected)
+    if ((interface->role(child) == QAccessible::EditableText) && (interface->state(child) & QAccessible::Protected))
         return ATSPI_ROLE_PASSWORD_TEXT;
     return qSpiRoleMapping[interface->role(child)].spiRole();
 }
@@ -1503,10 +1500,8 @@
 
     QAccessibleInterface* interfaceWithObject = interface;
 
-
     if (interface->role(0) == QAccessible::MenuItem && interface->object() &&
             inheritsQAction(interface->object())) {
-        qDebug() << "Role: " << interface->role(0);
         interface->navigate(QAccessible::Ancestor, 1, &interfaceWithObject);
         childIndex = interfaceWithObject->indexOfChild(interface);
     }
@@ -1732,9 +1727,13 @@
         int index = message.arguments().at(0).toInt();
         QStringList keyBindings;
         keyBindings = actionIface->keyBindings(index);
-        /* Might as well return the first key binding, what are the other options? */
+        if (keyBindings.isEmpty()) {
+            QString acc = interface->text(QAccessible::Accelerator, child);
+            if (!acc.isEmpty())
+                keyBindings.append(acc);
+        }
         if (keyBindings.length() > 0)
-            sendReply(connection, message, keyBindings.at(0));
+            sendReply(connection, message, keyBindings.join(";"));
         else
             sendReply(connection, message, QString());
     } else {
diff -Nru qt-at-spi-0.1.1+20120306/tests/tst_qt-atspi.cpp qt-at-spi-0.2.0/tests/tst_qt-atspi.cpp
--- qt-at-spi-0.1.1+20120306/tests/tst_qt-atspi.cpp	2012-03-05 13:34:16.000000000 +0000
+++ qt-at-spi-0.2.0/tests/tst_qt-atspi.cpp	2012-03-14 14:10:50.000000000 +0000
@@ -133,6 +133,9 @@
 
 void tst_QtAtSpi::initTestCase()
 {
+    // Oxygen style creates many extra items, it's simply unusable here
+    qDebug() << "Using plastique style...";
+    qApp->setStyle("plastique");
     QCOMPARE(qgetenv("QT_ACCESSIBILITY"), QByteArray("1"));
 
     dbus = DBusConnection();