lp://staging/~ubuntu-sdk-team/ubuntu-ui-toolkit/whereHaveAllTheBinariesGone

Branch merges

Propose for merging

No branches dependent on this one.

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

PS Jenkins bot: Approve (continuous-integration) on 2015-01-30

Tim Peeters: Approve on 2015-01-30

Diff: 95 lines (+48/-11)

2 files modified

export_modules_dir.sh (+1/-2)
run_tests.sh (+47/-9)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1415973: ./build_paths.inc: No such file or directory

Critical

Fix Released

Link a bug report

Related blueprints

1398. By Cris Dywan on 2015-01-30

Smarter arg handling and usage without args

1397. By Cris Dywan on 2015-01-29

Make suite optional and don't pass run arguments with other modes

1396. By Cris Dywan on 2015-01-29

Allow passing mode to run_tests and print Usage message

1395. By Cris Dywan on 2015-01-29

Update copyrights to 2015

1394. By Cris Dywan on 2015-01-29

Move check for binaries to run_tests.sh

So export_modules_dir.sh can be used without the sanity checks

1393. By Cris Dywan on 2015-01-29

Abort export_modules_dir.sh and ergo run_tests.sh if binaries are absent

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.