← Back to branch summary

~mir-team/unity-mir/trunk

~mir-team/unity-mir/trunk

Viewing all changes in revision 185.

Committer: CI bot
Author(s): Gerry Boland, Andreas Pokorny, Alberto Aguirre
Date: 2014-03-11 01:24:36 UTC
mfrom: (180.2.9 namespace-to-prevent-collision)
Revision ID: ps-jenkins@lists.canonical.com-20140311012436-v3n863l4ur4zyxiu

Wrap classes of the QML plugin in a unitymir namespace, prevents symbol collision with Mir Fixes: 1282248, 1289058

files added:
cmake

cmake/LinuxCrossCompile.cmake

cross-compile.sh

scripts

scripts/fix-qt-cmake.sh

scripts/setup-partial-armhf-chroot.sh

src/modules/Unity/Application/proc_info.cpp

src/modules/Unity/Application/proc_info.h

tests/mock_focus_controller.h

tests/mock_proc_info.h

tests/mock_session.h

files modified:
CMakeLists.txt

debian/control

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

src/modules/Unity/Application/inputarea.h

src/modules/Unity/Application/inputfilterarea.cpp

src/modules/Unity/Application/inputfilterarea.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

src/modules/Unity/Application/processcontroller.cpp

src/modules/Unity/Application/processcontroller.h

src/modules/Unity/Application/shellinputarea.cpp

src/modules/Unity/Application/shellinputarea.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/modules/Unity/Application/upstart/applicationcontroller.cpp

src/modules/Unity/Application/upstart/applicationcontroller.h

src/unity-mir/CMakeLists.txt

tests/CMakeLists.txt

tests/application_manager_test.cpp

tests/auto/modules/Unity/Application/CMakeLists.txt

tests/auto/modules/Unity/Application/main.cpp

tests/mock_application_controller.h

tests/mock_desktop_file_reader.h

tests/mock_oom_controller.h

tests/mock_process_controller.h

tests/taskcontroller_test.cpp

Show diffs side-by-side

added added

removed removed

cmake/LinuxCrossCompile.cmake

cross-compile.sh

scripts/fix-qt-cmake.sh

scripts/setup-partial-armhf-chroot.sh

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

src/modules/Unity/Application/inputarea.h

src/modules/Unity/Application/inputfilterarea.cpp

src/modules/Unity/Application/inputfilterarea.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

src/modules/Unity/Application/proc_info.cpp

src/modules/Unity/Application/proc_info.h

src/modules/Unity/Application/processcontroller.cpp

src/modules/Unity/Application/processcontroller.h

src/modules/Unity/Application/shellinputarea.cpp

src/modules/Unity/Application/shellinputarea.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/modules/Unity/Application/upstart/applicationcontroller.cpp

src/modules/Unity/Application/upstart/applicationcontroller.h

src/unity-mir/CMakeLists.txt

tests/CMakeLists.txt

tests/application_manager_test.cpp

tests/auto/modules/Unity/Application/CMakeLists.txt

tests/auto/modules/Unity/Application/main.cpp

tests/mock_application_controller.h

tests/mock_desktop_file_reader.h

tests/mock_focus_controller.h

tests/mock_oom_controller.h

tests/mock_proc_info.h

tests/mock_process_controller.h

tests/mock_session.h

tests/taskcontroller_test.cpp

Older »