~mir-team/qtmir/mir-0.16-rebuild

« back to all changes in this revision

Viewing changes to src/platforms/mirserver/nativeinterface.h

Committer: Daniel d'Andrada
Date: 2014-12-10 10:33:48 UTC
mto: This revision was merged to the branch mainline in revision 294.
Revision ID: daniel.dandrada@canonical.com-20141210103348-mn2kmwtxxo0y8yyw

removed :PATH from command line

files added:
src/platforms/mirserver/focussetter.cpp

src/platforms/mirserver/focussetter.h

src/platforms/mirserver/mirplacementstrategy.cpp

src/platforms/mirserver/mirplacementstrategy.h

src/platforms/mirserver/surfaceconfigurator.cpp

src/platforms/mirserver/surfaceconfigurator.h

tests/modules/common/mock_focus_controller.h

files removed:
debian/tests

debian/tests/control

debian/tests/run-tests

src/common/abstractdbusservicemonitor.cpp

src/common/abstractdbusservicemonitor.h

src/modules/Unity/Application/com.canonical.qtmir.gschema.xml

src/modules/Unity/Application/settings.cpp

src/modules/Unity/Application/settings.h

src/modules/Unity/Application/settings_interface.h

src/modules/Unity/Application/sharedwakelock.cpp

src/modules/Unity/Application/sharedwakelock.h

src/platforms/mirserver/mirwindowmanager.cpp

src/platforms/mirserver/mirwindowmanager.h

src/platforms/mirserver/qmirserver_p.cpp

src/platforms/mirserver/qmirserver_p.h

src/platforms/mirserver/surfaceobserver.cpp

src/platforms/mirserver/surfaceobserver.h

tests/modules/Application

tests/modules/Application/CMakeLists.txt

tests/modules/Application/application_test.cpp

tests/modules/SharedWakelock

tests/modules/SharedWakelock/CMakeLists.txt

tests/modules/SharedWakelock/sharedwakelock_test.cpp

tests/modules/common/mock_settings.h

tests/modules/common/mock_shared_wakelock.h

files renamed:
src/platforms/mirserver/mirserver.cpp => src/platforms/mirserver/mirserverconfiguration.cpp

src/platforms/mirserver/mirserver.h => src/platforms/mirserver/mirserverconfiguration.h

files modified:
CMakeLists.txt

debian/changelog

debian/control

debian/qtdeclarative5-qtmir-plugin.install

debian/rules

demos/qml-demo-shell/qml-demo-shell.qml

src/common/debughelpers.cpp

src/common/debughelpers.h

src/modules/Unity/Application/CMakeLists.txt

src/modules/Unity/Application/application.cpp

src/modules/Unity/Application/application.h

src/modules/Unity/Application/application_manager.cpp

src/modules/Unity/Application/application_manager.h

src/modules/Unity/Application/desktopfilereader.cpp

src/modules/Unity/Application/desktopfilereader.h

src/modules/Unity/Application/mirbuffersgtexture.cpp

src/modules/Unity/Application/mirsurfaceitem.cpp

src/modules/Unity/Application/mirsurfaceitem.h

src/modules/Unity/Application/mirsurfacemanager.cpp

src/modules/Unity/Application/mirsurfacemanager.h

src/modules/Unity/Application/plugin.cpp

src/modules/Unity/Application/proc_info.cpp

src/modules/Unity/Application/proc_info.h

src/modules/Unity/Application/session.cpp

src/modules/Unity/Application/sessionmanager.cpp

src/modules/Unity/Application/sessionmanager.h

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/display.cpp

src/platforms/mirserver/display.h

src/platforms/mirserver/displaywindow.cpp

src/platforms/mirserver/displaywindow.h

src/platforms/mirserver/miropenglcontext.cpp

src/platforms/mirserver/miropenglcontext.h

src/platforms/mirserver/mirserverintegration.cpp

src/platforms/mirserver/mirserverintegration.h

src/platforms/mirserver/mirserverstatuslistener.cpp

src/platforms/mirserver/nativeinterface.cpp

src/platforms/mirserver/nativeinterface.h

src/platforms/mirserver/promptsessionlistener.cpp

src/platforms/mirserver/promptsessionlistener.h

src/platforms/mirserver/qmirserver.cpp

src/platforms/mirserver/qmirserver.h

src/platforms/mirserver/qteventfeeder.cpp

src/platforms/mirserver/qteventfeeder.h

src/platforms/mirserver/services.cpp

src/platforms/mirserver/sessionlistener.cpp

src/platforms/mirserver/sessionlistener.h

tests/mirserver/QtEventFeeder/mock_qtwindowsystem.h

tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp

tests/mirserver/Screen/screen_test.cpp

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/CMakeLists.txt

tests/modules/DesktopFileReader/desktopfilereader_test.cpp

tests/modules/MirSurfaceItem/mirsurfaceitem_test.cpp

tests/modules/SessionManager/session_manager_test.cpp

tests/modules/SessionManager/session_test.cpp

tests/modules/common/mock_mir_session.h

tests/modules/common/mock_prompt_session.h

tests/modules/common/mock_prompt_session_manager.h

tests/modules/common/mock_renderable.h

tests/modules/common/mock_surface.h

tests/modules/common/qtmir_test.h

tests/modules/common/stub_scene_surface.h

Show diffs side-by-side

added added

removed removed

src/platforms/mirserver/nativeinterface.h

* This program is free software: you can redistribute it and/or modify it under

* the terms of the GNU Lesser General Public License version 3, as published by

#include <qpa/qplatformnativeinterface.h>

// local

#include "mirserver.h"

#include "mirserverconfiguration.h"

class NativeInterface : public QPlatformNativeInterface

{

public:

NativeInterface(const QWeakPointer<MirServer> &);

NativeInterface(const QSharedPointer<MirServerConfiguration> &);

virtual void *nativeResourceForIntegration(const QByteArray &resource);

QWeakPointer<MirServer> m_mirServer;

QSharedPointer<MirServerConfiguration> m_mirConfig;

};

#endif // NATIVEINTEGRATION_H

Older »