← Back to branch summary

~mardy/webbrowser-app/export-cookies

~mardy/webbrowser-app/export-cookies

Viewing all changes in revision 956.

Committer: CI Train Bot
Author(s): Riccardo Padovani, Olivier Tilloy, Riccardo Padovani
Date: 2015-04-08 14:09:17 UTC
mfrom: (934.2.36 settings-page)
Revision ID: ci-train-bot@canonical.com-20150408140917-zdjqnzmsh5sgw8c2

Add settings page, per design specification. This adds qml-module-qt-labs-folderlistmodel and qml-module-qt-labs-settings as runtime dependencies for webbrowser-app. Fixes: #1351183
Approved by: Bill Filler, Olivier Tilloy

files added:
src/app/webbrowser/SettingsPage.qml

src/app/webbrowser/SettingsPageHeader.qml

src/app/webbrowser/urlManagement.js

files removed:
src/app/webbrowser/settings.cpp

src/app/webbrowser/settings.h

files modified:
README

debian/control

src/app/browserapplication.cpp

src/app/config.h.in

src/app/webbrowser/AddressBar.qml

src/app/webbrowser/Browser.qml

src/app/webbrowser/CMakeLists.txt

src/app/webbrowser/history-model.cpp

src/app/webbrowser/history-model.h

src/app/webbrowser/webbrowser-app.cpp

src/app/webbrowser/webbrowser-app.qml

tests/unittests/history-model/tst_HistoryModelTests.cpp

Show diffs side-by-side

added added

removed removed

src/app/browserapplication.cpp

src/app/config.h.in

src/app/webbrowser/AddressBar.qml

src/app/webbrowser/Browser.qml

src/app/webbrowser/CMakeLists.txt

src/app/webbrowser/SettingsPage.qml

src/app/webbrowser/SettingsPageHeader.qml

src/app/webbrowser/history-model.cpp

src/app/webbrowser/history-model.h

src/app/webbrowser/settings.cpp

src/app/webbrowser/settings.h

src/app/webbrowser/urlManagement.js

src/app/webbrowser/webbrowser-app.cpp

src/app/webbrowser/webbrowser-app.qml

tests/unittests/history-model/tst_HistoryModelTests.cpp

Older »