← Back to branch summary

~macslow/unity/phablet-notification-renderer

~macslow/unity/phablet-notification-renderer

Viewing all changes in revision 594.

Committer: Mirco Müller
Date: 2013-05-13 12:38:00 UTC
mfrom: (507.2.162 phablet)
Revision ID: mirco.mueller@ubuntu.com-20130513123800-bbffopyq469ptxyj

Merge with trunk (unity/phablet)

files added:
CTestCustom.cmake.in

plugins/HudClient/hudtoolbarmodel.cpp

plugins/HudClient/hudtoolbarmodel.h

tests/qmltests/Dash/People

tests/qmltests/Dash/People/tst_PeopleFilterGrid.qml

tests/qmltests/Dash/tst_GenericLensView.qml

tests/qmltests/Dash/tst_LensView.qml

tests/qmltests/Hud/tst_Result.qml

tests/qmltests/Panel/Menus

tests/qmltests/Panel/Menus/tst_IndicatorMenuWindow.qml

tests/qmltests/utils/Unity/Test/MockObjectForInstanceOfTest.qml

tests/qmltests/utils/Unity/Test/MockObjectForInstanceOfTestChild.qml

valgrind-suppress

files removed:
Hud/AppStack.qml

Hud/AppStackItem.qml

Hud/graphics/app_selected@20.png

Hud/graphics/close@20.png

files renamed:
tests/mocks/Ubuntu/Application/Application.cpp => tests/mocks/Ubuntu/Application/ApplicationInfo.cpp

tests/mocks/Ubuntu/Application/Application.h => tests/mocks/Ubuntu/Application/ApplicationInfo.h

files modified:
Applications/Application.qml

Applications/applications.js

Bottombar/Bottombar.qml

CMakeLists.txt

CODING

Components/ApplicationManagerWrapper.qml

Components/FilterGrid.qml

Components/PageHeader.qml

Components/RatingStars.qml

Components/ResponsiveGridView.qml

Components/Stage.qml

Dash/Apps/RunningApplicationTile.qml

Dash/Apps/RunningApplicationsGrid.qml

Dash/Dash.qml

Dash/DashApps.qml

Dash/DashBar.qml

Dash/DashContent.qml

Dash/DashHome.qml

Dash/DashMusic.qml

Dash/DashPeople.qml

Dash/DashVideos.qml

Dash/GenericLensView.qml

Dash/Video/VideoPreview.qml

Dash/Video/VideosFilterGrid.qml

Hud/Hud.qml

Hud/Result.qml

Hud/ResultList.qml

Hud/ToolBar.qml

Panel/Indicators.qml

Shell.qml

SideStage/SideStage.qml

build

build_unity

cmake/modules/EnableCoverageReport.cmake

debian/changelog

debian/control

main.cpp

plugins/HudClient/CMakeLists.txt

plugins/HudClient/hudclient.cpp

plugins/HudClient/hudclient.h

plugins/HudClient/plugin.cpp

plugins/HudClient/plugin.h

plugins/HudClient/volumepeakdetector.h

plugins/Unity/CMakeLists.txt

plugins/Unity/categories.cpp

plugins/Unity/lens.cpp

plugins/Unity/lenses.cpp

plugins/Unity/peoplepreviewdata.cpp

plugins/Unity/peoplepreviewdata.h

plugins/Utils/qsortfilterproxymodelqml.cpp

plugins/Utils/qsortfilterproxymodelqml.h

plugins/Utils/ubuntuwindow.cpp

run

run_on_device

runtests.sh

tests/autopilot/qml_phone_shell/tests/__init__.py

tests/cleanincludes/includechecker.py

tests/mocks/Ubuntu/Application/ApplicationImage.cpp

tests/mocks/Ubuntu/Application/ApplicationImage.h

tests/mocks/Ubuntu/Application/ApplicationListModel.cpp

tests/mocks/Ubuntu/Application/ApplicationListModel.h

tests/mocks/Ubuntu/Application/ApplicationManager.cpp

tests/mocks/Ubuntu/Application/ApplicationManager.h

tests/mocks/Ubuntu/Application/CMakeLists.txt

tests/mocks/Ubuntu/Application/plugin.cpp

tests/mocks/Ubuntu/Application/plugin.h

tests/plugins/Utils/CMakeLists.txt

tests/plugins/Utils/modeltest.cpp

tests/plugins/Utils/qlimitproxymodeltest.cpp

tests/plugins/Utils/qsortfilterproxymodeltest.cpp

tests/qmltests/CMakeLists.txt

tests/qmltests/Components/tst_FilterGrid.qml

tests/qmltests/Components/tst_Revealer.qml

tests/qmltests/Components/tst_Stage.qml

tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml

tests/qmltests/Dash/tst_DashPreview.qml

tests/qmltests/Dash/tst_FilterGrids.qml

tests/qmltests/Dash/tst_PeoplePreview.qml

tests/qmltests/Hud/tst_Hud.qml

tests/qmltests/Panel/tst_Indicators.qml

tests/qmltests/plugins/HudClient/CMakeLists.txt

tests/qmltests/plugins/HudClient/fake_hud_plugin.cpp

tests/qmltests/plugins/HudClient/fake_libhud_client.cpp

tests/qmltests/plugins/HudClient/libhud_client_stub.cpp

tests/qmltests/plugins/HudClient/libhud_client_stub.h

tests/qmltests/plugins/Ubuntu/ChewieUI/CMakeLists.txt

tests/qmltests/plugins/Unity/CMakeLists.txt

tests/qmltests/plugins/Unity/fake_lens.h

tests/qmltests/plugins/Unity/fake_lenses.h

tests/qmltests/plugins/Unity/fake_unity_plugin.cpp

tests/qmltests/utils/Unity/Test/tst_UnityTest.qml

tests/utils/modules/Unity/Test/UnityTestCase.qml

tests/utils/modules/Unity/Test/testutil.cpp

tests/utils/modules/Unity/Test/testutil.h

tests/whitespace/check_whitespace.py

Show diffs side-by-side

added added

removed removed

Applications/Application.qml

Applications/applications.js

Bottombar/Bottombar.qml

CTestCustom.cmake.in

Components/ApplicationManagerWrapper.qml

Components/FilterGrid.qml

Components/PageHeader.qml

Components/RatingStars.qml

Components/ResponsiveGridView.qml

Components/Stage.qml

Dash/Apps/RunningApplicationTile.qml

Dash/Apps/RunningApplicationsGrid.qml

Dash/DashApps.qml

Dash/DashBar.qml

Dash/DashContent.qml

Dash/DashHome.qml

Dash/DashMusic.qml

Dash/DashPeople.qml

Dash/DashVideos.qml

Dash/GenericLensView.qml

Dash/Video/VideoPreview.qml

Dash/Video/VideosFilterGrid.qml

Hud/AppStack.qml

Hud/AppStackItem.qml

Hud/ResultList.qml

Hud/graphics/app_selected@20.png

Hud/graphics/close@20.png

Panel/Indicators.qml

SideStage/SideStage.qml

cmake/modules/EnableCoverageReport.cmake

debian/changelog

plugins/HudClient/CMakeLists.txt

plugins/HudClient/hudclient.cpp

plugins/HudClient/hudclient.h

plugins/HudClient/hudtoolbarmodel.cpp

plugins/HudClient/hudtoolbarmodel.h

plugins/HudClient/plugin.cpp

plugins/HudClient/plugin.h

plugins/HudClient/volumepeakdetector.h

plugins/Unity/CMakeLists.txt

plugins/Unity/categories.cpp

plugins/Unity/lens.cpp

plugins/Unity/lenses.cpp

plugins/Unity/peoplepreviewdata.cpp

plugins/Unity/peoplepreviewdata.h

plugins/Utils/qsortfilterproxymodelqml.cpp

plugins/Utils/qsortfilterproxymodelqml.h

plugins/Utils/ubuntuwindow.cpp

tests/autopilot/qml_phone_shell/tests/__init__.py

tests/cleanincludes/includechecker.py

tests/mocks/Ubuntu/Application/ApplicationImage.cpp

tests/mocks/Ubuntu/Application/ApplicationImage.h

tests/mocks/Ubuntu/Application/ApplicationInfo.cpp

tests/mocks/Ubuntu/Application/ApplicationInfo.h

tests/mocks/Ubuntu/Application/ApplicationListModel.cpp

tests/mocks/Ubuntu/Application/ApplicationListModel.h

tests/mocks/Ubuntu/Application/ApplicationManager.cpp

tests/mocks/Ubuntu/Application/ApplicationManager.h

tests/mocks/Ubuntu/Application/CMakeLists.txt

tests/mocks/Ubuntu/Application/plugin.cpp

tests/mocks/Ubuntu/Application/plugin.h

tests/plugins/Utils/CMakeLists.txt

tests/plugins/Utils/modeltest.cpp

tests/plugins/Utils/qlimitproxymodeltest.cpp

tests/plugins/Utils/qsortfilterproxymodeltest.cpp

tests/qmltests/CMakeLists.txt

tests/qmltests/Components/tst_FilterGrid.qml

tests/qmltests/Components/tst_Revealer.qml

tests/qmltests/Components/tst_Stage.qml

tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml

tests/qmltests/Dash/People/

tests/qmltests/Dash/People/tst_PeopleFilterGrid.qml

tests/qmltests/Dash/tst_DashPreview.qml

tests/qmltests/Dash/tst_FilterGrids.qml

tests/qmltests/Dash/tst_GenericLensView.qml

tests/qmltests/Dash/tst_LensView.qml

tests/qmltests/Dash/tst_PeoplePreview.qml

tests/qmltests/Hud/tst_Hud.qml

tests/qmltests/Hud/tst_Result.qml

tests/qmltests/Panel/Menus/

tests/qmltests/Panel/Menus/tst_IndicatorMenuWindow.qml

tests/qmltests/Panel/tst_Indicators.qml

tests/qmltests/plugins/HudClient/CMakeLists.txt

tests/qmltests/plugins/HudClient/fake_hud_plugin.cpp

tests/qmltests/plugins/HudClient/fake_libhud_client.cpp

tests/qmltests/plugins/HudClient/libhud_client_stub.cpp

tests/qmltests/plugins/HudClient/libhud_client_stub.h

tests/qmltests/plugins/Ubuntu/ChewieUI/CMakeLists.txt

tests/qmltests/plugins/Unity/CMakeLists.txt

tests/qmltests/plugins/Unity/fake_lens.h

tests/qmltests/plugins/Unity/fake_lenses.h

tests/qmltests/plugins/Unity/fake_unity_plugin.cpp

tests/qmltests/utils/Unity/Test/MockObjectForInstanceOfTest.qml

tests/qmltests/utils/Unity/Test/MockObjectForInstanceOfTestChild.qml

tests/qmltests/utils/Unity/Test/tst_UnityTest.qml

tests/utils/modules/Unity/Test/UnityTestCase.qml

tests/utils/modules/Unity/Test/testutil.cpp

tests/utils/modules/Unity/Test/testutil.h

tests/whitespace/check_whitespace.py

valgrind-suppress

Older »