summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix webview example for use with QtWebEngine.v5.4.0-rc1v5.4.0Christian Strømme2014-11-212-0/+12
| | | | | | | | | | When the QtWebEngine is used as a back-end we need to call QtWebEngine::initialize() or the example will fail as OpenGL context sharing needs to be enabled. Task-number: QTBUG-42745 Change-Id: I27ffc4043f759470f4d40441e62de2ba10728a01 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
* iOS: emit progressChangedMorten Johan Sørvig2014-11-131-0/+2
| | | | | | | | Use the simplest possible implementation: 0% at loadUrl and 100% at loadComplete. Change-Id: Iefea52023df3d200e55dabde39b0a0217791e898 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* iOS: Correctly map to scene coordinates.Christian S2014-11-131-1/+1
| | | | | | | The views coordinates where not mapped to the scene. Change-Id: Ide11bb8b9d54093c17988e79561839ebca9c3faf Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Fix various documentation issuesTopi Reinio2014-11-113-17/+9
| | | | | | | | | | | | | | | | | - Replace multiple include statements with a single, Qt module include - Remove url variable (taken from the global config) - Remove indexes variable (using 'depends' is sufficient) - Remove unused subproject - Fix selector for QML types - Fix example path to have working manifest XML - Rename index.html to qtwebview-index.html (to avoid collision with the main Qt doc index page) - Fix section titles and add a 'QML Types' section for the QML module page. Change-Id: Ie30582d8db83bfbdee613efec66013bb73d1a9b1 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* iOS: Fix header names.Christian Strømme2014-11-111-3/+3
| | | | | | | | | The include statements for the headers UIKit was written UiKit (with lower-case 'i') causing build failure on systems with case sensitive file-systems. Change-Id: I7a3062ad8f0e9a0ee8a4b3f06465222332bb6c14 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Doc: Add a screenshot of the new webview example.Christian Strømme2014-11-071-0/+0
| | | | | Change-Id: I18b35618351913a2cb8bb862be9dfdacce899574 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Doc: Fix the namespace.Christian Strømme2014-11-071-1/+1
| | | | | | | Some more left-overs from a donor. Change-Id: Ife77a36c449c6634cef2e0fb75e01bb0047e0282 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Introduce the possibility of delayed creation of the native webview.Friedemann Kleint2014-11-035-8/+40
| | | | | | | | | | | | | Make it possible to delay the creation of the native webview until componentComplete(). This ensures a parent window is present, thus avoiding flicker by creating/reparenting top-level web views. Platforms that do not want delayed creation can enforce it in QWebViewPrivate::create(). Task-number: QTBUG-41130 Change-Id: Ib6aadd7ce464a9d70c4446a63847c12c86578b80 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Android: don't show the zoom controls by default.Christian Strømme2014-10-301-7/+13
| | | | | | | | | | | We don't have any APIs for toggling the visibility of the zoom controls in Qt and the support on different platforms might vary, so we should just hide the controls by default. On devices with API level less then 11 the controls will still be visible, as there is no way to disable them. Note that this does _not_ mean we are disable zooming. Change-Id: Ie49c4bc4e8441b6b1bdc0a0db0d728d8934a14eb Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Revert "Android: Add separate controller item for android."Friedemann Kleint2014-10-302-85/+1
| | | | | | | | | | | Change 336f9c52237e7d9f97c18d2a464aacc48ab62804 (Fix QWindowControllerItem::geometryChanged()) made the same modification, this should work for Android as well. This reverts commit e849a5de6046ccaf2e76e636d640ec322ed87f45. Change-Id: I9f277a356aca019fd33bb6c092d3b342c94bc64a Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Remove variable 'set but not used' warning when building the example.Christian Strømme2014-10-301-1/+1
| | | | | Change-Id: I1dbf1efc7a02c15c6eb5450b79cafba38feceb0f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix QWindowControllerItem::geometryChanged().Friedemann Kleint2014-10-211-2/+8
| | | | | | | | | Map to scene coordinate and refuse invalid geometries occurring during initialization. Task-number: QTBUG-41130 Change-Id: I99987ada8398362aeb8d9c3235303335235fef71 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Android: Remove dependency to Android Extras.Christian Strømme2014-10-214-16/+16
| | | | | | | Use our private JNI API in Qt Core instead. Change-Id: I4064a05601733e83f6db0ded0184390ba1910d73 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Polish the example.Friedemann Kleint2014-10-215-5/+64
| | | | | | | | | | | | | - Point it to qt.io and add command line option handling - Adapt size to screen for high resolution screens and to accommodate qt.io which does not work with small windows. - Add Back/Forward buttons - Load on editingFinished (return pressed) of address field. - Handle errors in user input more gracefully by defaulting to about:blank Change-Id: I4ed4efce16b1d4739ac9e413dbe6427b5367de1c Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Make "imports" depend on "webview".Christian Strømme2014-10-201-0/+1
| | | | | | | We need to make sure that we build the webview sub-project first. Change-Id: Id0db97b945188aa508df4892bd9e3a918fd5bf87 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Fix documentationChristian Strømme2014-10-166-48/+52
| | | | | | | | | There where some missing configurations and leftovers from earlier that caused the doc generation to fail. This is only a quick build / infrastructure change. Change-Id: Iebcad3f654361c5d27bc4b1ee370f6e802378531 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Fix builds using QQuickWebEngineViewChristian Strømme2014-10-161-0/+2
| | | | | | | | We need to include the definition for Q_WEBVIEW_EXPORT for the QQuickWebEngineView implementation. Change-Id: Ia5b74fc757aa6e1e584e45063a038ffe77f971c0 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Add iOS to the list of supported platforms in the overview doc page.Christian Strømme2014-10-021-1/+1
| | | | | Change-Id: Id02b68853374852e5a8e47a80667482ef5e9bcb5 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Android: Add separate controller item for android.Christian Strømme2014-09-092-1/+85
| | | | | | | | We need translate the geometry coordinates to position the window correctly in the scene. Change-Id: I8ed36a446b31fdeaf478b1ac660f29813fba39a4 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Add dtor in QWindowControllerItem.Christian Strømme2014-09-093-0/+12
| | | | | | | | Both the base and Android implementation needs to clean-up their resources on destruction. Change-Id: I504ed781bc8400afb044ed54c5fbe13daf8c917d Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Android: Call onResume() and onPause() when the application is paused.Christian Strømme2014-09-053-2/+57
| | | | | | | | | To avoid unnecessary resource usage we should call onPause() and onResume() on the WebView when the application state changes to avoid unnecessary resource usage. Change-Id: I31bf37f8b13e8f9da65a7a6c616c536456c5bea2 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* QWindowControllerItem: Always check for m_controlledWindow.Friedemann Kleint2014-09-021-2/+4
| | | | | | | Prevent the example from crashing when implementation is available. Change-Id: I0ad40c2f5220ab07c4f3fb67d57997e4c78b6ff8 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Android: Don't use URLUtil.guessUrl()Christian Strømme2014-09-021-2/+1
| | | | | | | The string should be past unmodified to the back-end. Change-Id: I03a95953a5c872b47b888fbd689e714eeaa85d26 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Improve the Look&Feel of the webview exampleChristian Strømme2014-09-021-42/+25
| | | | | | | The example was not looking or behaving correctly on Android. Change-Id: Ic7e69c3cdf55e8ac4762794824ca7d9bc905cdc9 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Document QUrl usage behavior.Morten Johan Sørvig2014-09-013-1/+17
| | | | | | | | | | | | Document that QUrls are used as-is and that QUrl::fromUserInput should be called when appropriate. Update the example to call QUrl::fromUserInput via a helper class. This is a workaround until QtQuick provides a fromUserInput function. Change-Id: I51f521126e50ee4d9b0223ef11f32d5576be10a8 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Fix build on OS XSamuel Gaist2014-08-292-7/+13
| | | | | | | | This patch corrects the include path for qwebview_global.h as well as fix the headers generation Change-Id: I23893e3e2c33979208e597d6f755d4e94a4eacca Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Fix test for Windows.Friedemann Kleint2014-08-281-9/+27
| | | | | | | | | Create the cache location in case it does not exist. Use a temporary file to prevent leaks and clashes. Use QUrl::fromLocalFile(). Change-Id: I0dec5eadd1eac54818d8971b9f4236955651b8af Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Fix exports.Friedemann Kleint2014-08-284-3/+61
| | | | | | | Add qwebview_global.h file to ensure exports work on Windows. Change-Id: Ide184a575dd7355b148ec21964e53dca1f555c77 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Add iOS implementation.Morten Johan Sørvig2014-08-265-0/+365
| | | | | | | | | | | | | Use UIWebView instead of the newer WKWebView for pre-iOS8 compatibility. Implement QWindowControllerItem for iOS instead of using QWindow::fromWinId() - foreign windows are not yet supported on iOS. Change-Id: I75edd3032ad5dc4c81d31f86e441b69ca21c0046 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Add the missing pieces to make the module build-able with qmakeSamuel Gaist2014-08-255-34/+61
| | | | | Change-Id: I77d83c3865cbb29bacf20781a5cbe6255216ab10 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Long live Qt Web View!Eskil Abrahamsen Blomfeldt2014-08-2035-0/+2033
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 05:48:50 +0000