summaryrefslogtreecommitdiffstats
path: root/examples/webenginewidgets/demobrowser/browserapplication.h
Commit message (Collapse)AuthorAgeFilesLines
* Fix license header for examplesKai Koehne2017-09-201-1/+1
| | | | | | Task-number: QTBUG-60006 Change-Id: Ie1604aed3d5a9ba566e898eae232227ba340bfaa Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-05-091-0/+1
|\ | | | | | | Change-Id: I2843a633721212850db77c772caf24e0ea82b450
| * [Demobrowser] Fix command line option parsing.Alexandru Croitor2016-05-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing just command line options to Chromium prevents loading of the initial startup url. This happens because the startup url is overridden by the last command line argument, which happens to be a Chromium option, thus an invalid URL. Fix consists in iterating through the command line arguments, until a non-option argument is found (doesn't start with a dash), and use that as the startup URL. Change-Id: Ibe2946b25b2e023c094a85e50d2ccbd5bfce2977 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Make all examples BSD licensedKai Koehne2016-01-221-28/+27
| | | | | | | | | | Change-Id: I98924e5f8754b7b2ed095abf00eb73fa26399b2d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Add icon property and iconChanged signal to QWebEnginePagePeter Varga2016-03-311-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | The new API makes possible to access downloaded icons via QWebEnginePage. Thus the QNAM usage for downloading favicons and the corresponding workaround due to authentication are removed from the demobrowser. Change-Id: I9fdcc7ee7673f7caa239d932f20a51c74b24763f Task-number: QTBUG-51179 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Updated license headersJani Heikkinen2016-02-011-22/+31
|/ | | | | | | | | From Qt 5.7 -> examples are lisenced under BSD license, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new BSD header Change-Id: I12d6dd8ebeddf1c39e8aed5095fd224f5e0a455f Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Fix favicon load after authentication in browser examplePeter Varga2015-09-081-0/+17
| | | | | | | | | | | | In the widget browser example QNetworkAccessManager downloads the favicon for a webpage. In case of HTTP or proxy authentication the credentials may not be cached when QNetworkAccessManager tries to load the favicon. Therefore, store last credentials and provide it to QNetworkAccessManager when it emits authenticationRequired signal. Change-Id: I2d057bfa7291a13cec30db9debaf30382415122b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix broken signal/slot connections in browser example on OS X.Jake Petroules2015-09-071-2/+0
| | | | | Change-Id: Ic5b7e149e0ff9165a7244aab5d5249c5ca856747 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Rename the widget browser example demobrowserAllan Sandfeld Jensen2015-09-031-0/+127
The browser example already uses the name demobrowser internally, this changes the external name to make it easier to refer to explicitly, and avoid users thinking fancybrowser is the better example. Change-Id: Ic093eb4881352b5f796bf565df01edb929aba39c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>