← Back to branch summary

~osomon/webbrowser-app/maxCacheSizeHint

« back to all changes in this revision

Viewing changes to src/app/BrowserWindow.qml

  • Committer: Olivier Tilloy
  • Date: 2015-04-08 15:29:44 UTC
  • mfrom: (930.1.25 webbrowser-app)
  • Revision ID: olivier.tilloy@canonical.com-20150408152944-zg7hpedldixspgf7
Merge the latest changes from trunk and resolve a conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/app/BrowserWindow.qml
1
1
/*
2
 
 * Copyright 2014 Canonical Ltd.
 
2
 * Copyright 2014-2015 Canonical Ltd.
3
3
 *
4
4
 * This file is part of webbrowser-app.
5
5
 *
39
39
 
40
40
    Connections {
41
41
        target: window.currentWebview
 
42
        ignoreUnknownSignals: true
42
43
        onFullscreenChanged: {
43
44
            if (!window.forceFullscreen) {
44
45
                if (window.currentWebview.fullscreen) {