← Back to branch summary

~unity-team/qtmir/silo0

~unity-team/qtmir/silo0

« back to all changes in this revision

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

Committer: Gerry Boland
Date: 2015-08-13 12:06:35 UTC
mfrom: (358.1.5 qtmir)
Revision ID: gerry.boland@canonical.com-20150813120635-r3tvr9a7wj3dj6bi

Merge trunk

files modified:
debian/changelog

debian/copyright

src/common/abstractdbusservicemonitor.cpp

src/common/abstractdbusservicemonitor.h

src/modules/Unity/Application/application_manager.cpp

src/modules/Unity/Application/applicationcontroller.h

src/modules/Unity/Application/applicationscreenshotprovider.cpp

src/modules/Unity/Application/applicationscreenshotprovider.h

src/modules/Unity/Application/dbuswindowstack.cpp

src/modules/Unity/Application/dbuswindowstack.h

src/modules/Unity/Application/desktopfilereader.cpp

src/modules/Unity/Application/desktopfilereader.h

src/modules/Unity/Application/mirbuffersgtexture.h

src/modules/Unity/Application/mirsurface.cpp

src/modules/Unity/Application/mirsurface.h

src/modules/Unity/Application/mirsurfaceitem.cpp

src/modules/Unity/Application/mirsurfacemanager.h

src/modules/Unity/Application/proc_info.cpp

src/modules/Unity/Application/proc_info.h

src/modules/Unity/Application/session.cpp

src/modules/Unity/Application/session.h

src/modules/Unity/Application/session_interface.h

src/modules/Unity/Application/sessionmanager.cpp

src/modules/Unity/Application/sessionmanager.h

src/modules/Unity/Application/taskcontroller.cpp

src/modules/Unity/Application/taskcontroller.h

src/modules/Unity/Application/ubuntukeyboardinfo.cpp

src/modules/Unity/Application/ubuntukeyboardinfo.h

src/platforms/mirserver/clipboard.cpp

src/platforms/mirserver/clipboard.h

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/mirserver.cpp

src/platforms/mirserver/mirserver.h

src/platforms/mirserver/mirserverintegration.cpp

src/platforms/mirserver/mirserverintegration.h

src/platforms/mirserver/mirserverstatuslistener.cpp

src/platforms/mirserver/mirserverstatuslistener.h

src/platforms/mirserver/mirwindowmanager.cpp

src/platforms/mirserver/mirwindowmanager.h

src/platforms/mirserver/nativeinterface.cpp

src/platforms/mirserver/nativeinterface.h

src/platforms/mirserver/plugin.cpp

src/platforms/mirserver/plugin.h

src/platforms/mirserver/promptsessionlistener.cpp

src/platforms/mirserver/promptsessionlistener.h

src/platforms/mirserver/qtcompositor.cpp

src/platforms/mirserver/qtcompositor.h

src/platforms/mirserver/qteventfeeder.cpp

src/platforms/mirserver/qteventfeeder.h

src/platforms/mirserver/screen.cpp

src/platforms/mirserver/services.cpp

src/platforms/mirserver/services.h

src/platforms/mirserver/sessionauthorizer.cpp

src/platforms/mirserver/sessionauthorizer.h

src/platforms/mirserver/sessionlistener.cpp

src/platforms/mirserver/sessionlistener.h

src/platforms/mirserver/surfaceobserver.cpp

src/platforms/mirserver/surfaceobserver.h

src/platforms/mirserver/ubuntutheme.cpp

src/platforms/mirserver/ubuntutheme.h

tests/mirserver/Clipboard/clipboard_test.cpp

tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp

tests/mirserver/Screen/screen_test.cpp

tests/modules/Application/application_test.cpp

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/DesktopFileReader/desktopfilereader_test.cpp

tests/modules/General/objectlistmodel_test.cpp

tests/modules/MirSurfaceItem/mirsurfaceitem_test.cpp

tests/modules/SessionManager/session_manager_test.cpp

tests/modules/SessionManager/session_test.cpp

tests/modules/SharedWakelock/sharedwakelock_test.cpp

tests/modules/TaskController/taskcontroller_test.cpp

tests/modules/common/mock_application_controller.h

tests/modules/common/mock_desktop_file_reader.h

tests/modules/common/mock_mir_session.h

tests/modules/common/mock_proc_info.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_session.h

tests/modules/common/mock_surface.h

tests/modules/common/qtmir_test.cpp

tests/modules/common/qtmir_test.h

tests/modules/common/stub_input_channel.h

tests/modules/common/stub_scene_surface.h

Show diffs side-by-side

added added

removed removed

src/platforms/mirserver/mirserverintegration.h

12

12

*

13

13

* You should have received a copy of the GNU Lesser General Public License

14

14

* along with this program. If not, see <http://www.gnu.org/licenses/>.

15

*

16

* Authors: Gerry Boland <gerry.boland@canonical.com>

17

* Daniel d'Andrada <daniel.dandrada@canonical.com>

18

15

*/

19

16

20

17

#ifndef MIRSERVERINTEGRATION_H

Older »