~robertcarr/unity-mir/stuff

Viewing changes to src/modules/Unity/Application/plugin.cpp

Committer: Tarmac
Author(s): Daniel d'Andrada, Gerry Boland, Ricardo Mendoza
Date: 2013-09-11 13:42:09 UTC
mfrom: (75.4.3 qtweb-and-surface-attrib-changes)
Revision ID: tarmac-20130911134209-mjaqbmbaknegm34t

* Authorize QtWebProcess
* Bind surface to application and signal state changes. Fixes: https://bugs.launchpad.net/bugs/1215039.

Approved by PS Jenkins bot, Gerry Boland.

files modified:
src/modules/Unity/Application/application.h

src/modules/Unity/Application/application_manager.cpp

src/modules/Unity/Application/application_manager.h

src/modules/Unity/Application/mirsurface.cpp

src/modules/Unity/Application/mirsurface.h

src/modules/Unity/Application/mirsurfacemanager.cpp

src/modules/Unity/Application/mirsurfacemanager.h

src/modules/Unity/Application/plugin.cpp

Show diffs side-by-side

added added

removed removed

src/modules/Unity/Application/plugin.cpp

Q_UNUSED(scriptEngine);

DLOG("applicationManagerSingleton (engine=%p, scriptEngine=%p)", engine, scriptEngine);

static ApplicationManager* instance = new ApplicationManager();

return instance;

return ApplicationManager::singleton();

}

static QObject* surfaceManagerSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {

Older »