← Back to branch summary

~bregma/qtmir/use-ual-info

« back to all changes in this revision

Viewing changes to tests/modules/ApplicationManager/application_manager_test.cpp

  • Committer: CI Train Bot
  • Author(s): Daniel d'Andrada
  • Date: 2015-12-10 13:08:38 UTC
  • mfrom: (423.3.1 origin/multiSurfaceApp2)
  • Revision ID: ci-train-bot@canonical.com-20151210130838-11ftzh83klgfnm74
Make Session hold multiple surfaces

+ Standardize MirSurface debug messages and account for multiple surfaces per app
Approved by: Gerry Boland

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/modules/ApplicationManager/application_manager_test.cpp
50
50
 
51
51
        SessionInterface* qmlSession = sessionManager.findSession(mirSession);
52
52
        if (qmlSession) {
53
 
            qmlSession->setSurface(qmlSurface);
 
53
            qmlSession->registerSurface(qmlSurface);
54
54
        }
55
55
 
56
56
        // I assume that applicationManager ignores the mirSurface parameter, so sending