Viewing all changes in revision 1403.
- Committer: Michael Terry
- Date: 2015-01-09 21:59:27 UTC
- mfrom: (1386.1.10 tutorial-refactor)
- Revision ID: michael.terry@canonical.com-20150109215927-5wwwp76prytv070v
Merge from -refactor
- files added:
- plugins/Unity/Indicators/actionrootstate.cpp
- tests/mocks/Lights
- files renamed:
- plugins/Unity/Indicators/rootactionstate.cpp => plugins/Unity/Indicators/rootstateparser.cpp
- plugins/Unity/Indicators/rootactionstate.h => plugins/Unity/Indicators/rootstateparser.h
- plugins/Utils/qsortfilterproxymodelqml.cpp => plugins/Utils/unitysortfilterproxymodelqml.cpp
- plugins/Utils/qsortfilterproxymodelqml.h => plugins/Utils/unitysortfilterproxymodelqml.h
- tests/mocks/Unity/Indicators/RootActionState.qml => tests/mocks/Unity/Indicators/ModelActionRootState.qml
- tests/plugins/Utils/qsortfilterproxymodeltest.cpp => tests/plugins/Utils/unitysortfilterproxymodeltest.cpp
- files modified:
- cmake/modules/QmlTest.cmake
expand all
collapse all
added
removed
