← Back to branch summary

~alan-griffiths/miral/BasicWindowManager-modify_window-doesnt-set-policy

~alan-griffiths/miral/BasicWindowManager-modify_window-doesnt-set-policy

Viewing all changes in revision 336.

Committer: Gerry Boland
Date: 2016-09-15 23:34:00 UTC
mfrom: (333.1.7 qtmir-531)
Revision ID: gerry.boland@canonical.com-20160915233400-5cr3nb3gdtxkwg1r

[miral-qt] Merge applicable QtMir changes from rev 531 to 537

This chunk of QtMir commits was missed out on.

files removed:
miral-qt/src/modules/Unity/Application/dbuswindowstack.cpp

miral-qt/src/modules/Unity/Application/dbuswindowstack.h

files modified:
miral-qt/CMakeLists.txt

miral-qt/demos/qml-demo-client/CMakeLists.txt

miral-qt/demos/qml-demo-shell/CMakeLists.txt

miral-qt/src/modules/Unity/Application/CMakeLists.txt

miral-qt/src/modules/Unity/Application/application_manager.cpp

miral-qt/src/modules/Unity/Application/application_manager.h

miral-qt/src/modules/Unity/Screens/CMakeLists.txt

miral-qt/src/platforms/mirserver/CMakeLists.txt

miral-qt/src/platforms/mirserver/cursor.cpp

miral-qt/src/platforms/mirserver/mirserverintegration.cpp

miral-qt/src/platforms/mirserver/qmirserver.cpp

miral-qt/src/platforms/mirserver/qmirserver.h

miral-qt/src/platforms/mirserver/screenwindow.cpp

miral-qt/tests/framework/CMakeLists.txt

miral-qt/tests/framework/qtmir_test.cpp

miral-qt/tests/mirserver/QtEventFeeder/CMakeLists.txt

miral-qt/tests/mirserver/Screen/CMakeLists.txt

miral-qt/tests/mirserver/ScreensModel/CMakeLists.txt

miral-qt/tests/modules/Application/CMakeLists.txt

miral-qt/tests/modules/Application/application_test.cpp

miral-qt/tests/modules/ApplicationManager/CMakeLists.txt

miral-qt/tests/modules/ApplicationManager/application_manager_test.cpp

miral-qt/tests/modules/SessionManager/CMakeLists.txt

miral-qt/tests/modules/SharedWakelock/CMakeLists.txt

miral-qt/tests/modules/WindowManager/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

miral-qt/CMakeLists.txt

miral-qt/demos/qml-demo-client/CMakeLists.txt

miral-qt/demos/qml-demo-shell/CMakeLists.txt

miral-qt/src/modules/Unity/Application/CMakeLists.txt

miral-qt/src/modules/Unity/Application/application_manager.cpp

miral-qt/src/modules/Unity/Application/application_manager.h

miral-qt/src/modules/Unity/Application/dbuswindowstack.cpp

miral-qt/src/modules/Unity/Application/dbuswindowstack.h

miral-qt/src/modules/Unity/Screens/CMakeLists.txt

miral-qt/src/platforms/mirserver/CMakeLists.txt

miral-qt/src/platforms/mirserver/cursor.cpp

miral-qt/src/platforms/mirserver/mirserverintegration.cpp

miral-qt/src/platforms/mirserver/qmirserver.cpp

miral-qt/src/platforms/mirserver/qmirserver.h

miral-qt/src/platforms/mirserver/screenwindow.cpp

miral-qt/tests/framework/CMakeLists.txt

miral-qt/tests/framework/qtmir_test.cpp

miral-qt/tests/mirserver/QtEventFeeder/CMakeLists.txt

miral-qt/tests/mirserver/Screen/CMakeLists.txt

miral-qt/tests/mirserver/ScreensModel/CMakeLists.txt

miral-qt/tests/modules/Application/CMakeLists.txt

miral-qt/tests/modules/Application/application_test.cpp

miral-qt/tests/modules/ApplicationManager/CMakeLists.txt

miral-qt/tests/modules/ApplicationManager/application_manager_test.cpp

miral-qt/tests/modules/SessionManager/CMakeLists.txt

miral-qt/tests/modules/SharedWakelock/CMakeLists.txt

miral-qt/tests/modules/WindowManager/CMakeLists.txt

Older »