← Back to branch summary

~gerboland/unity8/initialSurfaceGeometry

~gerboland/unity8/initialSurfaceGeometry

« back to all changes in this revision

Viewing changes to tests/mocks/Ubuntu/SystemSettings/CMakeLists.txt

Committer: Gerry Boland
Date: 2014-12-09 12:55:58 UTC
mfrom: (1139.1.343 unity8)
Revision ID: gerry.boland@canonical.com-20141209125558-d68labgupwxfz91r

Merge trunk

files added:
plugins/Wizard

plugins/Wizard/50-com.canonical.unity.wizard.pkla

plugins/Wizard/CMakeLists.txt

plugins/Wizard/PageList.cpp

plugins/Wizard/PageList.h

plugins/Wizard/System.cpp

plugins/Wizard/System.h

plugins/Wizard/Wizard.qmltypes

plugins/Wizard/plugin.cpp

plugins/Wizard/plugin.h

plugins/Wizard/qmldir

qml/Dash/ScopesList.qml

qml/Dash/ScopesListCategory.qml

qml/Dash/ScopesListCategoryItem.qml

qml/Wizard

qml/Wizard/CheckableSetting.qml

qml/Wizard/Page.qml

qml/Wizard/Pages

qml/Wizard/Pages.qml

qml/Wizard/Pages/10-welcome.qml

qml/Wizard/Pages/20-sim.qml

qml/Wizard/Pages/30-passwd-type.qml

qml/Wizard/Pages/40-wifi.qml

qml/Wizard/Pages/50-location.qml

qml/Wizard/Pages/60-reporting.qml

qml/Wizard/Pages/80-finished.qml

qml/Wizard/Pages/data

qml/Wizard/Pages/data/meet_ubuntu_simcard@30.png

qml/Wizard/Pages/here-terms.qml

qml/Wizard/Pages/passwd-confirm.qml

qml/Wizard/Pages/passwd-set.qml

qml/Wizard/StackButton.qml

qml/Wizard/Wizard.qml

tests/mocks/MeeGo

tests/mocks/MeeGo/CMakeLists.txt

tests/mocks/MeeGo/QOfono

tests/mocks/MeeGo/QOfono/CMakeLists.txt

tests/mocks/MeeGo/QOfono/MockOfonoManager.qml

tests/mocks/MeeGo/QOfono/MockOfonoSimManager.qml

tests/mocks/MeeGo/QOfono/MockQOfono.cpp

tests/mocks/MeeGo/QOfono/MockQOfono.h

tests/mocks/MeeGo/QOfono/plugin.cpp

tests/mocks/MeeGo/QOfono/plugin.h

tests/mocks/MeeGo/QOfono/qmldir

tests/mocks/QMenuModel/dbus-enums.h

tests/mocks/Ubuntu/SystemSettings

tests/mocks/Ubuntu/SystemSettings/CMakeLists.txt

tests/mocks/Ubuntu/SystemSettings/LanguagePlugin

tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/CMakeLists.txt

tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qml

tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/qmldir

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/CMakeLists.txt

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.cpp

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.h

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/plugin.cpp

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/plugin.h

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/qmldir

tests/mocks/Wizard

tests/mocks/Wizard/CMakeLists.txt

tests/mocks/Wizard/MockSystem.cpp

tests/mocks/Wizard/MockSystem.h

tests/mocks/Wizard/Wizard.qmltypes

tests/mocks/Wizard/mockplugin.cpp

tests/mocks/Wizard/mockplugin.h

tests/mocks/Wizard/qmldir

tests/plugins/Wizard

tests/plugins/Wizard/CMakeLists.txt

tests/plugins/Wizard/tst_pagelist.cpp

tests/plugins/Wizard/tst_system.cpp

tests/qmltests/Wizard

tests/qmltests/Wizard/licenses

tests/qmltests/Wizard/licenses/en_US.html

tests/qmltests/Wizard/licenses/fr_CA.html

tests/qmltests/Wizard/licenses/fr_FR.html

tests/qmltests/Wizard/nolicenses

tests/qmltests/Wizard/tst_Wizard.qml

files removed:
qml/Dash/ScopesOverview.qml

qml/Dash/ScopesOverviewAll.qml

qml/Dash/ScopesOverviewFavorites.qml

qml/Dash/ScopesOverviewTab.qml

files modified:
CMakeLists.txt

build.sh

debian/changelog

debian/control

debian/unity8-common.install

debian/unity8-private.install

debian/unity8.install

include/paths.h.in

plugins/AccountsService/AccountsService.cpp

plugins/AccountsService/AccountsService.h

plugins/CMakeLists.txt

plugins/Unity/Launcher/desktopfilehandler.cpp

plugins/Unity/Launcher/launcheritem.cpp

plugins/Unity/Launcher/launchermodel.cpp

plugins/Unity/Launcher/launchermodel.h

po/am.po

po/ar.po

po/ast.po

po/az.po

po/be.po

po/bg.po

po/br.po

po/bs.po

po/ca.po

po/ca@valencia.po

po/ckb.po

po/cs.po

po/da.po

po/de.po

po/el.po

po/en_AU.po

po/en_GB.po

po/eo.po

po/es.po

po/eu.po

po/fa.po

po/fi.po

po/fo.po

po/fr.po

po/gd.po

po/gl.po

po/he.po

po/hi.po

po/hr.po

po/hu.po

po/hy.po

po/id.po

po/is.po

po/it.po

po/ja.po

po/km.po

po/kn.po

po/ko.po

po/ku.po

po/ky.po

po/lo.po

po/lt.po

po/lv.po

po/ml.po

po/mr.po

po/ms.po

po/my.po

po/nb.po

po/nl.po

po/pa.po

po/pl.po

po/pt.po

po/pt_BR.po

po/ro.po

po/ru.po

po/shn.po

po/si.po

po/sl.po

po/sq.po

po/sr.po

po/sv.po

po/sw.po

po/ta.po

po/te.po

po/th.po

po/tr.po

po/ug.po

po/uk.po

po/unity8.pot

po/vi.po

po/xh.po

po/zh_CN.po

po/zh_HK.po

po/zh_TW.po

qml/CMakeLists.txt

qml/Components/Dialogs.qml

qml/Components/EdgeDemo.qml

qml/Dash/Dash.qml

qml/Dash/DashContent.qml

qml/Dash/GenericScopeView.qml

qml/Dash/PageHeader.qml

qml/Greeter/Clock.qml

qml/Greeter/GreeterContent.qml

qml/Launcher/Launcher.qml

qml/Shell.qml

tests/mocks/AccountsService/AccountsService.cpp

tests/mocks/AccountsService/AccountsService.h

tests/mocks/CMakeLists.txt

tests/mocks/QMenuModel/CMakeLists.txt

tests/mocks/QMenuModel/QDBusActionGroup.qml

tests/mocks/QMenuModel/plugin.cpp

tests/mocks/Ubuntu/CMakeLists.txt

tests/mocks/Unity/CMakeLists.txt

tests/mocks/Unity/fake_scopes.cpp

tests/mocks/Unity/fake_scopes.h

tests/mocks/Unity/fake_scopesoverview.cpp

tests/mocks/Unity/fake_scopesoverview.h

tests/plugins/CMakeLists.txt

tests/qmltests/CMakeLists.txt

tests/qmltests/Dash/tst_Dash.qml

tests/qmltests/Dash/tst_GenericScopeView.qml

Show diffs side-by-side

added added

removed removed

tests/mocks/Ubuntu/SystemSettings/CMakeLists.txt

1

add_subdirectory(LanguagePlugin)

2

add_subdirectory(SecurityPrivacy)

Older »