summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
...
* Let the application sanitize the URL.Jocelyn Turcotte2013-08-201-1/+1
| | | | | | | | | | Do like the QtQuick example and let the Widgets example use urlFromUserInput to add a missing http scheme instead of letting QtWebEngine do it. This is the same behavior as QtWebKit does. Change-Id: Iac1570523253126e059afb00c3a2ff844e177ff1 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* demo browser: Make it link.Jocelyn Turcotte2013-08-2011-16/+116
| | | | | | | | The ifdefs should later be removed along with the feature implementations. Change-Id: If73f4c4c02c00e90d6cf54c6a08bb37f43fa95bc Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* demo browser: Fix the compilation with QtWebEngine.Jocelyn Turcotte2013-08-2015-126/+127
| | | | | | | | | | | This makes the demo compile, but not link since most of the methods aren't implemented yet. Also disable downloads and printing since they require a bit more work to instead use the page directly. Change-Id: I59adfe07fda077c6909f70f12800a4cfa6a6dad2 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Import the demo browser into widget examples.Jocelyn Turcotte2013-08-2068-0/+13450
| | | | | | | | | Import the sources as-is, without adding it to the build, to allow performing diffs later on the changes that were needed to port it to use QtWebEngine and manage source compatibility issues. Change-Id: Icf8a284881ce2153e9b5a1ba97dbe77096f1b88d Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Import QtWebKit public headers.Jocelyn Turcotte2013-08-201-2/+4
| | | | | | | | | | | | | | | | | | | This is the first step toward re-implementing part of the QWebView API on top of QtWebEngine. The plan is to import the complete headers to facilitate diffs and progress tracking. Changes squashed in this commit: - Use the QWebEngine prefix for class names - Strip out non-public members and directives - Allow building using those headers by disabling the Q_PROPERTY macros and by adding a dummy implementation for virtual methods directly in the header - Update the widgetsnanobrowser example to comply with the slight changes from the previous API Change-Id: Ia7efa5430f775d09b493544430a04856cc7928f6 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Change "Contents" to "Engine" in API class names.Jocelyn Turcotte2013-08-194-15/+15
| | | | | Change-Id: I58d83f4f33728f92e4bf13b6be30b15528fdd033 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Detach common.pri from the nano browser examples.Jocelyn Turcotte2013-08-195-20/+8
| | | | | | | | | | | | | | Move common.pri to the root directory to be able to use it with tests. Remove nano browser specific logic (util.h include and common resources) from this file and use relative paths in the examples instead. This also remove unnecessary directives: - lib doesn't have to be added to INCLUDEPATH since proper modules are used - util.h doesn't need to be added to HEADERS, moc doesn't need to go through it - MOC_DIR doesn't have to be adjusted anymore Change-Id: Id706e7f2ef7c9607bdcd0ba63afecf5b5854262b Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Prepare the directories to have more examples included.Jocelyn Turcotte2013-08-1911-6/+6
| | | | | | | | | | | This also ajust the name to be consistent with other Qt examples. - Move nano browser one directory level down, also renaming them to match their target name - Remove the dashes from the target names - Rename the qtquick example directory to quick, matching the style in lib Change-Id: I4a5e31be0b919ae596eadbf731be52372ae61151 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* [Examples] Add Ctrl + L shortcut for testingPierre Rossi2013-07-312-0/+17
| | | | | | | It's quite convenient when one wants to test if navigating works. Change-Id: I89404df3a9a878701180fdd5b5144b46b3f68df5 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Split out the Widgets and QtQuick integrationPierre Rossi2013-07-315-11/+16
| | | | | | | | | | | | | | | This is the first step to making proper Qt Modules out of QtWebEngine. The Widgets integration becomes a proper C++ Qt Module while we make the QtQuick side a QML plugin for now (could probably be promoted if the need arises). Code-wise, this means the introduction of a WebContentsAdapterClient interface that is subclassed by the private implementation of our API classes for delegation of things that are UI specific. Functionality from WebContents and the like is exposed via the WebContentsAdapter. Change-Id: I4ca3395b9fe8502a24e36002cfd5af44067bb6e8 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Move the icons into common.Zeno Albisser2013-07-039-21/+18
| | | | | | | | Use the same icons for the widgets and qtquick example. Remove the styling as it does not work on all platforms anyway. Change-Id: Iff59455689619ae45823eb835768d7c4fc75bd93 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Adjust LIBPATH on Mac.Zeno Albisser2013-07-011-1/+2
| | | | | Change-Id: I1d8affaa797a61a71051b3a347ade4e589fd68a7 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Adding some missing license headersSergio Ahumada2013-06-251-0/+40
| | | | | Change-Id: If41e2991be7877060f7739877f756acf2679b688 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Include fix.Zeno Albisser2013-06-181-0/+1
|
* Disable the back/forward buttons when appropriate.Zeno Albisser2013-06-183-2/+8
|
* Startup URL from command line argsPierre Rossi2013-06-185-10/+84
|
* Use QQmlProperty::write instead of Binding item.Zeno Albisser2013-06-181-18/+0
|
* Add initial API layer for widgets.Zeno Albisser2013-06-182-1/+15
|
* Add initial API layer for QtQuick and connect the signals accordingly.Zeno Albisser2013-06-181-2/+3
|
* Qt Quick example: use a qrc filePierre Rossi2013-06-184-4/+16
|
* cleaner content margins for the nested layoutsPierre Rossi2013-06-181-1/+5
| | | | also remove QQUICKWEBENGINE env var
* Split out the example into two distinct onesPierre Rossi2013-06-1715-0/+507
Cleaner than deciding on startup with an env variable