← Back to branch summary

~ubuntu-branches/ubuntu/trusty/kde-runtime/trusty-proposed

« back to all changes in this revision

Viewing changes to kwalletd/autotests/qtest_kwallet.h

  • Committer: Package Import Robot
  • Author(s): Harald Sitter
  • Date: 2014-04-08 12:38:48 UTC
  • Revision ID: package-import@ubuntu.com-20140408123848-0tc1ny1i3imfjp7a
Tags: 4:4.12.97-0ubuntu3
* Flat diff import upstream git commits since 4.12.97 from KDE/4.13 branch in
  patches/upstream_git.patch (using flat diff because of intermediate merges)
* Bring back kubuntu_disable-gpg-backend.diff dropped in 4:4.12.97-0ubuntu2
  in a revised, more complete version. In addition to changes brought in by
  upstream_git.patch this should make the disabling work as intended.

Show diffs side-by-side

added added

removed removed

Lines of Context:
kwalletd/autotests/qtest_kwallet.h
41
41
    TestObject tc; \
42
42
    KGlobal::ref(); /* don't quit qeventloop after closing a mainwindow */ \
43
43
    int result = QTest::qExec( &tc, argc, argv ); \
44
 
    dbus.start("kill", QStringList() << pid); \
 
44
    dbus.start("kill", QStringList() << "-9" << pid); \
45
45
    dbus.waitForFinished(); \
46
46
    return result; \
47
47
}