← Back to branch summary

~system-apps-team/webbrowser-app/multiple-windows

« back to all changes in this revision

Viewing changes to tests/unittests/qml/tst_SettingsPage.qml

  • Committer: Olivier Tilloy
  • Date: 2016-09-02 13:59:45 UTC
  • mfrom: (1465.1.67 webbrowser-app)
  • Revision ID: olivier.tilloy@canonical.com-20160902135945-dzw3f1ly39hdpf2v
Merge the latest changes from trunk and resolve a minor conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unittests/qml/tst_SettingsPage.qml
44
44
                property url homepage
45
45
                property string searchEngine
46
46
                property int newTabDefaultSection: 0
 
47
                property int defaultAudioDevice: 0
 
48
                property int defaultVideoDevice: 0
47
49
            }
48
50
        }
49
51
    }