~dandrader/unity8/multiSurfaceApp

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

Committer: CI Train Bot
Author(s): Michael Zanetti
Date: 2015-11-26 13:49:57 UTC
mfrom: (2021.4.7 unity8-move-screenshots-to-tests)
Revision ID: ci-train-bot@canonical.com-20151126134957-t6iry267i8fgejlv

move screenshots out of the Dash dir

This was consuming 2.5 megs of installed size while they really are
only used for testing.
Approved by: Albert Astals Cid

files renamed:
qml/Dash/graphics/phone/screenshots/ => tests/mocks/Unity/Application/resources/screenshots/

files modified:
po/shn.po

tests/mocks/Unity/Application/ApplicationInfo.cpp

tests/mocks/Unity/Application/ApplicationScreenshotProvider.cpp

tests/mocks/Unity/Application/ApplicationTestInterface.cpp

tests/mocks/Unity/Application/resources/surfaces.qrc

tests/qmltests/Components/tst_ZoomableImage.qml

Show diffs side-by-side

added added

removed removed

tests/mocks/Unity/Application/ApplicationScreenshotProvider.cpp

return QImage();

}

QString screenshot = app->screenshot();

// QImage doesn't understand qrc:/// but we have QUrls in use which don't like the empty protcol ":/"

screenshot.replace("qrc:///", ":/");

QImage image;

if (!image.load(app->screenshot())) {

qWarning() << "failed loading app image" << app->screenshot();

if (!image.load(screenshot)) {

qWarning() << "failed loading app image" << screenshot;

}

Older »