lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/pushToAdb

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-ui-toolkit/staging at revision 1400

PS Jenkins bot: Approve (continuous-integration) on 2015-02-05

Tim Peeters: Approve on 2015-02-05

Diff: 21 lines (+5/-1)

1 file modified

push_to_phone.sh (+5/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1417997: /tmp/push_to_phone/copy.sh: 4: /tmp/push_to_phone/copy.sh: Syntax error: "(" unexpected

Low

Fix Released

Link a bug report

Related blueprints

1397. By Cris Dywan on 2015-02-04

Ensure adb is running (and fallback arch if dpkg-dev is missing)

1396. By Nicholas Skaggs on 2015-02-03

Re-add autopilot helper documentation and update. Fixes: https://bugs.launchpad.net/bugs/1409778, https://bugs.launchpad.net/bugs/1410477.

Approved by PS Jenkins bot, Tim Peeters.

1395. By Albert Astals Cid on 2015-02-03

Don't use Qt::PopupFocusReason to change the focus

Even if it is the correct reason QtQuick is since 5.4 ignoring
focus changes due to PopupFocusReason

More at https://qt.gitorious.org/qt/qtdeclarative/commit/e60d8a28034550ae08b258494726050ea9638602. Fixes: https://bugs.launchpad.net/bugs/1395014.

Approved by Zsombor Egri, PS Jenkins bot.

1394. By Cris Dywan on 2015-01-30

Abort export_modules_dir.sh and ergo run_tests.sh if binaries are absent. Fixes: https://bugs.launchpad.net/bugs/1415973.

Approved by PS Jenkins bot, Tim Peeters.

1393. By Cris Dywan on 2015-01-29

Get arch for push_to_phone.sh from device and handle adb refusal.

Approved by PS Jenkins bot, Tim Peeters.

1392. By Albert Astals Cid on 2015-01-29

Adapt to behaviour change in handling of QVariants from QML to C++ in Qt 5.4

[QTBUG-40431] When a JavaScript object/array is passed to C++ through
  a QVariant, the engine no longer immediately converts the object
  recursively into a QVariantMap or QVariantList but instead stores a
  QJSValue in the QVariant. This prevents a loss of data when the JS
  object contains non-primitive types such as function objects for
  example. Code that expects the variant type to be exactly
  QVariant::Map or QVariant::List may need to be adapted. Registered
  conversion functions however ensure that code that merely calls
  toMap() or toList() continues to work. Fixes: https://bugs.launchpad.net/bugs/1395017.

Approved by PS Jenkins bot, Zsombor Egri.

1391. By Tim Peeters on 2015-01-29

Split up MainView in MainView and MainViewBase. Move docs to MainView.qdoc.

Approved by PS Jenkins bot, Zsombor Egri.

1390. By Albert Astals Cid on 2015-01-29

Fix test failure with Qt 5.4 ExpandablesColumn::test_expandedItem()

In Qt 5.4 an alias to a null variable is correctly null instead of undefined like
it was in 5.3, since we still want 5.3 support i'm conveting it to a verify with ==
that uses JS loose comparison to accept both null and undefined. Fixes: https://bugs.launchpad.net/bugs/1395012.

Approved by PS Jenkins bot, Zsombor Egri.

1389. By Albert Astals Cid on 2015-01-29

Adapt to behaviour change in handling of QVariants from QML to C++ in Qt 5.4

[QTBUG-40431] When a JavaScript object/array is passed to C++ through
  a QVariant, the engine no longer immediately converts the object
  recursively into a QVariantMap or QVariantList but instead stores a
  QJSValue in the QVariant. This prevents a loss of data when the JS
  object contains non-primitive types such as function objects for
  example. Code that expects the variant type to be exactly
  QVariant::Map or QVariant::List may need to be adapted. Registered
  conversion functions however ensure that code that merely calls
  toMap() or toList() continues to work. Fixes: https://bugs.launchpad.net/bugs/1394991.

Approved by PS Jenkins bot, Zsombor Egri.

1388. By Tim Peeters on 2015-01-27

Add performance test for MainView.

Approved by PS Jenkins bot, Zsombor Egri.