summaryrefslogtreecommitdiffstats
path: root/examples/webengine/quicknanobrowser/util.h
Commit message (Collapse)AuthorAgeFilesLines
* Clean the file structure of quicknanobrowser and quicktestbrowserJocelyn Turcotte2015-01-231-73/+0
| | | | | | | | | - Remove the unnecessary intermediate ApplicationEngine class - Rename quickwindow.qml to BrowserWindow.qml - Move the injected Utils QObject into utils.h Change-Id: I3b0551e2bf477fc94640c71736de26c46c1ab633 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into devAllan Sandfeld Jensen2014-11-111-1/+1
|\ | | | | | | | | | | | | | | Conflicts: src/core/browser_context_qt.cpp src/webengine/api/qquickwebengineview_p.h Change-Id: I73bdec03b627b282851d7dda12006d4ab631072c
| * Fix URLs in examples.Friedemann Kleint2014-11-041-1/+1
| | | | | | | | | | Change-Id: I528b7c4c22a1c47f54fe1b78a9d781a6af9cfc6b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Use QUrl::fromLocalFilePierre Rossi2014-10-101-1/+1
|/ | | | | | | | so that we can open local files on the command line for quick testing. Change-Id: Ica0fd2242d90e5499c2f1550bc87362f20bf7938 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fork the quicknanobrowser as tests/quicktestbrowserJocelyn Turcotte2014-03-191-1/+1
| | | | | | | | | | | | | | This also removed experimental API uses from the quicknanobrowser example, which should be used mainly for documentation purposes. The quicktestbrowser should be the one that we use from now on as a raw testbed of new APIs. As with other targets in the tests directory, it will only be built by default if Qt is configured with -developer-build (and without -nomake tests). Change-Id: Ib4461c898cd3227bbb810493daac4d841d0d8f3e Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Rename example directories to match the source install destinationJocelyn Turcotte2014-03-191-0/+73
To match other modules example directory structures we should deploy our examples in a directory matching the module name, webengine and webenginewidgets in our case. qmake uses the relative directory of each example up to the upper "examples" directory to decide where they will be deployed when running the sources install target. Change-Id: I59ce7ff8a30f98fad20064c7eecf72b784f1d275 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>