← Back to branch summary

~mterry/unity8/oobe-revert-geonames

« back to all changes in this revision

Viewing changes to tests/mocks/Unity/Application/ApplicationManager.cpp

  • Committer: Michał Sawicz
  • Date: 2013-12-17 16:04:47 UTC
  • mto: This revision was merged to the branch mainline in revision 600.
  • Revision ID: michal.sawicz@canonical.com-20131217160447-d1inqe0kmfgse2b8
Introduce a qml directory, move all QML, JS and assets, under it, adapt the rest to match.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/mocks/Unity/Application/ApplicationManager.cpp
274
274
        "   smooth: true\n"
275
275
        "   fillMode: Image.PreserveAspectCrop\n"
276
276
        "}").arg(topMargin)
277
 
            .arg(shellAppDirectory())
 
277
            .arg(qmlDirectory())
278
278
            .arg(application->icon().toString());
279
279
    application->setWindowQml(windowQml);
280
280
 
285
285
        "   source: \"file://%1/Dash/graphics/phone/screenshots/%2.png\"\n"
286
286
        "   smooth: true\n"
287
287
        "   fillMode: Image.PreserveAspectCrop\n"
288
 
        "}").arg(shellAppDirectory())
 
288
        "}").arg(qmlDirectory())
289
289
            .arg(application->icon().toString());
290
290
    application->setImageQml(imageQml);
291
291
}