← Back to branch summary

~unity-team/unity8/trunk

« back to all changes in this revision

Viewing changes to tests/qmltests/Dash/tst_Card.qml

  • Committer: CI bot
  • Author(s): Daniel d'Andrada
  • Date: 2014-09-18 09:43:48 UTC
  • mfrom: (1233.4.1 outOfSourceTreeCardTests)
  • Revision ID: ps-jenkins@lists.canonical.com-20140918094348-ujoi4dg8muuq5kgm
Make tst_Card work from outside the source tree (LP:1359201)

Currently it only works if you buid&run them from inside a subdir
of the unity8 source tree (ie, ./build).

If you build&run from a sibling directory it would not find the image
files and would therefore fail. Fixes: 1359201
Approved by: Andrea Cimitan

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/qmltests/Dash/tst_Card.qml
29
29
 
30
30
    property string cardData: '
31
31
    {
32
 
      "art": "../../../tests/qmltests/Dash/artwork/music-player-design.png",
33
 
      "mascot": "../../../tests/qmltests/Dash/artwork/avatar.png",
34
 
      "emblem": "../../../tests/qmltests/Dash/artwork/emblem.png",
 
32
      "art": "'+Qt.resolvedUrl("artwork/music-player-design.png").toString()+'",
 
33
      "mascot": "'+Qt.resolvedUrl("artwork/avatar.png").toString()+'",
 
34
      "emblem": "'+Qt.resolvedUrl("artwork/emblem.png").toString()+'",
35
35
      "title": "foo",
36
36
      "subtitle": "bar",
37
37
      "summary": "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",