summaryrefslogtreecommitdiffstats
path: root/examples/webenginewidgets/demobrowser
Commit message (Collapse)AuthorAgeFilesLines
* Remove DemoBrowserJüri Valdmann2017-07-2676-14736/+0
| | | | | | | | | | [ChangeLog][Examples] Removed WebEngine Demo Browser example, which got superseded by the improved WebEngine Widgets Simple Browser. Task-number: QTBUG-59819 Change-Id: I214e6f5f3a946ed617a9f4d628d3259a69874ca1 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Merge remote-tracking branch 'origin/5.9' into devAllan Sandfeld Jensen2017-07-054-26/+3
|\ | | | | | | Change-Id: Ida702fd5fa05a32d6cd7fc737aa061da74b675a0
| * Always compile QWebEnginePage::printJüri Valdmann2017-06-263-25/+0
| | | | | | | | | | | | | | | | | | | | | | - Remove two out of five layers of ifdefs around and inside this method. - Now always compiled but will yield an error if printing is disabled. - Remove printing-related ifdefs from demobrowser. Task-number: QTBUG-61510 Change-Id: I79781189d3d3fb62db0a2216b2b989e3fa1d1f86 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Rolf Eike Beer <eb@emlix.com>
| * Use AllowPersistentCookies as default setting in demobrowserMichal Klocek2017-06-201-1/+3
| | | | | | | | | | | | | | | | | | By default we should allow persistent cookies otherwise demobrowser might give an impression that cookies are not working. Task-number: QTBUG-58675 Change-Id: I13ef2729b7f4a757a0d7e0c695dafd4e2f1f75be Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Revert "Fix flushing the cookies with demobrowser"Michal Klocek2017-06-082-9/+11
| | | | | | | | | | | | | | | | | | | | | | Mea culpa ! This is not only not required in 5.9.1 but also does not even compile. This reverts commit dc70e81da3f7b639ace9c5cc14e1fd4eb1942e4c. Task-number: QTBUG-61299 Change-Id: I0879abe58a23588bddf9e4217899d7bfbf604438 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Fix flushing the cookies with demobrowserMichal Klocek2017-06-062-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix destruction of browser context, which takes place on qt_call_post_routines. Unfortunately demo browser destructs its windows just before qapplication destructor runs, so there is no more main event loop running. Please note this is just a quick fix, and proper fix would require refactoring the example not to use anit-pattern of deriving from qapplication. Task-number: QTBUG-58675 Change-Id: I419a1655a70397e69fecef2ceb37cbfc7e7f5ca4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-05-022-6/+2
|\| | | | | | | | | | | | | | | | | | | | | src/3rdparty used sha1 from 5.9, because both 5.9 and dev are using same branch now. Conflicts: src/3rdparty tests/auto/widgets/qwebenginepage/BLACKLIST Change-Id: I16a33e0f91779d1ee3a230070ff4248699c2e1bd
| * Fix crash on macOS when closing last tab of a windowAlexandru Croitor2017-04-211-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because of weird interaction between deleteLater(), Qt::WA_DeleteOnClose, and QQuickRenderControlPrivate::windowDestroyed() which executes all the deferred deletions at a bad time, there were some use-after-free crashes. The workaround is not to close the window when the last tab is closed, but rather create a new tab, like the behavior was on non-macOS platforms. Task-number: QTBUG-58982 Change-Id: I00295838c298af382cac78bb22c47d6de60e7755 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * DemoBrowser: Fix use of system proxyKai Koehne2017-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | The example did always set an application proxy, though it was empty if no proxy was explicitly set in the system. This however blocked the use of the system settings. Task-number: QTBUG-58748 Change-Id: I50d9116e491cb7c1ab5b8fc610736d60e0bc9ea8 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devAllan Sandfeld Jensen2017-03-282-2/+2
|\| | | | | | | Change-Id: I3a6f92b6da850b124aae68af390211b613d3d640
| * Remove uses of QString::nullMarc Mutz2017-03-112-2/+2
| | | | | | | | | | | | | | It's going to be deprecated. Change-Id: Iec967478785d327caa846a259fb8eeff18173429 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | demobrowser: Show download interruption reasonFlorian Bruhin2017-03-271-1/+1
|/ | | | | | | Task-number: QTBUG-56839 Change-Id: Id43a3389714b56d1ce82f6f4e69b52ecfbbfeeec Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Allan Sandfeld Jensen2017-03-022-1/+3
|\ | | | | | | Change-Id: Iff6ab3c287c58d8ec84a1513460bfce5218e8a61
| * Add support for macOS Airplay to Demobrowser in presence of dual GPUsAlexandru Croitor2017-02-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously when Airplay was activated and a new QWebEngineView instance was created, a black area would be rendered inside the view. This happened because of incompatible OpenGL contexts. The global Qt OpenGL context could not share its textures with the newly created "after-airplay" context, due to the contexts being used by different GPUs (only possible on a MacBook Pro). The fix is to add the NSSupportsAutomaticGraphicsSwitching option into the application plist file, which informs macOS that the application supports usage of dual GPUs, and thus allows sharing of contexts across GPUs. Task-number: QTBUG-54053 Change-Id: Ic37fb75f164922bcca6456054174171fa9ba2bfb Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Fix crash on context menuAllan Sandfeld Jensen2017-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | Instead of calling deleteLater, just tell close to delete the menu itself. Task-number: QTBUG-59080 Change-Id: I3eae382781f813ed3c6f27b78088b94ed1c486dd Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Fix webengine demobrowser exampleIonut Alexandrescu2017-03-012-10/+11
|/ | | | | | | | | | | fullScreenNotification is a child of fullScreenView and should not be deleted. On multiscreen systems, the fullScreenView window was always shown on the main monitor Restore the main window position Change-Id: I2c940306d06668ad52a2388832ceb48b4791779d Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* demobrowser: Fix compilation warningPeter Varga2016-10-071-0/+2
| | | | | Change-Id: I283365c72d351e62bc749cbc60e06472e52255ec Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Fix memory leak on printAllan Sandfeld Jensen2016-09-231-1/+1
| | | | | | | We need to delete the QPrintDialog. Change-Id: I959f963ba2e44091acb0c762ac680037bccc5b43 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Add printing on a QPrinter to the demobrowserMichael Bruning2016-08-282-11/+35
| | | | | Change-Id: I307103956bf50469a5c4cbe3656f655925f55653 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-054-6/+29
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also blacklist tst_QWebEnginePage::comboBoxPopupPositionAfterChildMove() and comboBoxPopupPositionAfterMove(). Conflicts: .qmake.conf src/3rdparty src/core/render_widget_host_view_qt.cpp src/core/resources/resources.gyp src/webengine/doc/src/qtwebengine-platform-notes.qdoc src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h tests/auto/widgets/qwebenginepage/BLACKLIST tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp tools/qmake/mkspecs/features/functions.prf Task-number: QTBUG-55158 Change-Id: I1d73ac9b3ca5293ad3c7e3a56f4c395da930e6f4
| * Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-08-021-2/+20
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/resources/resources.gyp src/webengine/doc/src/qtwebengine-overview.qdoc src/webenginewidgets/api/qwebenginepage.cpp src/webenginewidgets/api/qwebenginescriptcollection.cpp src/webenginewidgets/api/qwebenginescriptcollection_p.h tests/auto/widgets/qwebenginepage/BLACKLIST And readded newly in 5.6 enabled tests to the BLACKLIST. Change-Id: I4ab1fc54ebfaaf940df81b0d8d6bdd15cae8b7c4
| | * Fixup Back/Forward short-cutsAllan Sandfeld Jensen2016-07-221-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove backspace short-cut, Chromium will already handle that if it is standard on the platform. Also we were not triggering on Back/Forward buttons due to those being mapped to prev/next tab item in Qt. Task-number: QTBUG-54546 Change-Id: I9a4f48c718c5685ca9ca1b032d8b04409ac622ca Reviewed-by: Jesus Fernandez <jesus.fernandez@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-06-273-4/+9
| |\| | | | | | | | | | Change-Id: Ic6686df8f82f710a3441501b7eeaffe69fbcbdf7
| | * Remove infinite loop when loading history.Michael Bruning2016-06-202-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | Add a flag to let checkForExpired remove the entries directly. Task-number: QTBUG-54222 Change-Id: Iddac9e50f645d74b95d0ea13ed76d7f858ddd137 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Make all examples high-dpi awareKai Koehne2016-06-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Setting the Qt::AA_EnableHighDpiScaling attribute makes sure that the scrollbars are scaled, and that the default zoom level is sensible. Task-number: QTBUG-54113 Change-Id: I0ae7eb97cb9e2824e7f9b92d77cf2986cac66685 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Add View Source API and make the feature available from context menuPeter Varga2016-08-022-16/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][QtWebEngineQML][QQuickWebEngineView] View Source feature is now supported [ChangeLog][QtWebEngineWidgets][QWebEnginePage] View Source feature is now supported Change-Id: Icc16da71fc6ec95880897fc9744dd8be8c004e00 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Add back "Open Link in New Tab" to Demobrowser's context menuPeter Varga2016-07-132-6/+1
|/ / | | | | | | | | Change-Id: Ied45cf010aef87e319a01274399938cff7c1a53e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-06-111-1/+0
|\| | | | | | | Change-Id: Ib010ede9756fb02992a3276ae7ec90ef1ab56a00
| * Do not trigger find on slash keyAllan Sandfeld Jensen2016-06-031-1/+0
| | | | | | | | | | | | | | | | Application short-cuts override the passing the keys to WebCore, and makes it impossible to type '/' in form elements. Change-Id: I7df99547f99a3a0703d98d19d3ccdb23de0641ce Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | demobrowser: Fix meta object system warningJoerg Bornemann2016-05-242-3/+1
| | | | | | | | | | | | | | | | | | | | Do not redefine QWebEngineView::iconChanged. This fixes the following warning: QMetaObject::indexOfSignal: signal iconChanged(QIcon) from QWebEngineView redefined in WebView Change-Id: I2489bfcf9379200f9bfa24345b56679f138894fe Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | demobrowser: Remove connection to non-existent signalJoerg Bornemann2016-05-241-2/+0
| | | | | | | | | | | | | | This amends commit 213fbe76. Change-Id: Ie5ca9f7713b0653e0e5241eb3e99644425a3b1e3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7.0Michael Bruning2016-05-231-1/+3
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/browser_context_adapter.cpp src/core/web_contents_adapter.cpp src/webengine/doc/src/qtwebengine-platform-notes.qdoc tests/auto/widgets/qwebenginepage/BLACKLIST Change-Id: I768fc954a9a2147fc3669961286163a0a824def3
| * add missing example installOswald Buddenhagen2016-05-101-1/+3
| | | | | | | | | | Change-Id: Ifee9bb458de2c15760da21938b5e5bb598936161 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-05-096-59/+93
|\| | | | | | | Change-Id: I2843a633721212850db77c772caf24e0ea82b450
| * Quick fix for not working history in demobrowserMichal Klocek2016-05-044-50/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current implementation of history manager seems to be not straight forward. To display history we use QList to keep history items plus model adapter in form of HistoryModel (QAbstractTableModel) plus HistoryFilterModel to avoid duplication, plus HistoryTreeModel to make a tree view with split for dates, plus TreeProxyModel on top to enable sorting. This approach unfortunately falls apart when items should be deleted from the model by treeView. This ends badly with corrupted cached values. This fix removes history items using history manager. It also abandons HistoryTreeModel since frequent sourceReset calls make it unusable. If split for dates it desired the better approach would be to implement history tree model already at HistoryManager level to avoid unmaintainable code. Task-number: QTBUG-49913 Task-number: QTBUG-50255 Change-Id: Ic9cebb52b623bd453119e11b5e907eaa90609e34 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * [Demobrowser] Fix command line option parsing.Alexandru Croitor2016-05-042-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Replace print dialog with a custom one for printing to pdf.Michael Bruning2016-05-025-13/+349
| | | | | | | | | | | | | | | | The standard pdf print dialog does not work on OS X and Windows. Task-number: QTBUG-53016 Change-Id: Ic9dd1a1603e1cdbd82fef095cc660814bcd8c98e Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-04-254-18/+3
|\| | | | | | | Change-Id: I329397621f19ba3890be5daf44a6bb2d668ad2d8
| * Fix contextMenu handling in examplesMichal Klocek2016-04-211-3/+4
| | | | | | | | | | | | | | | | Adds missing deleteLater on close Change-Id: Id337856f138e0d38f0c72d3962ccac309d36c73e Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * demobrowser: Remove unused loadingUrlJoerg Bornemann2016-04-212-18/+0
| | | | | | | | | | | | | | | | | | Remove the unused m_loadingUrl member. Remove the loadingUrl signal that was forwarded to urlChanged. QWebEngineView already emits urlChanged. There's no need to do this twice. Change-Id: Ib9734c5b1571745f7b82b4e5f2bc92c7f1d8f51c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * demobrowser: Fix HistoryManager::clearJoerg Bornemann2016-04-211-1/+1
| | | | | | | | | | | | | | | | Clear the model before saving. Otherwise the cleared history will appear again after restarting the demobrowser. Change-Id: I79f939c1f1e8ee993127d139cefe7f5818ce593c Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * demobrowser: Fix precision of progress bar renderingJoerg Bornemann2016-04-201-1/+1
| | | | | | | | | | | | | | The progress bar never reached the 100% mark. Change-Id: Id87bdb27f882d0d77ed0ad590e2c2278ce6fba92 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Merge branch '5.6' into 5.7Allan Sandfeld Jensen2016-04-181-3/+6
|\| | | | | | | Change-Id: I490e0ee46d3ff040ca26426feb7e4d6ef7098f94
| * Demobrowser: Fix black screen after exiting fullscreen mode on OS X.Alexandru Croitor2016-04-151-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When exiting fullscreen while viewing a full screen video, the video is replaced with a black screen, and does not switch back to the initial page. This happens when hide() is called on a native window while being in fullscreen, which hides the window, but does not exit full screen mode, thus showing a black screen. The workaround fix consists of two parts: 1) Make sure to delete the fullscreen window object, to release the OS virtual screen it occupies (visible in mission control as a black rectangle). 2) Hide and show the main page window, to force exit fullscreen mode. Change-Id: I364d4427e84957ed97f57a14e2cfc2c95aed6f48 Task-number: QTBUG-52058 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Remove "Save Page" web action from the standard context menuJoerg Bornemann2016-04-131-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The SavePage web action is only useful if the user code reacts on the downloadRequested signal. Also, having SavePage available is not useful for e.g. hybrid applications. Extend the demobrowser example to show how to add the SavePage web action to the context menu. Change-Id: I979bcd9f5a25d2cae07ef819663afde17784440b Task-number: QTBUG-52370 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Remove default values for printToPdf callbacks and unify API.Michael Bruning2016-04-131-1/+1
| | | | | | | | | | | | | | Adds default QPageLayout values. Change-Id: Ibf2964ecd86350a51d682e385973f830ac4347a7 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Fix recentlyAudible Widgets and Quick API.Alexandru Croitor2016-04-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Rename all uses of wasRecentlyAudible to recentlyAudible. Add missing recentlyAudible properties. Change QtQuick slots to simple functions. Change affected demobrowser example. Adjust documentation for the API. Change-Id: I5a6f7b8384c0b7e34afaa5c412a5543c210d3ef9 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* | Add icon property and iconChanged signal to QWebEnginePagePeter Varga2016-03-318-138/+20
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Add API for context menu dataAllan Sandfeld Jensen2016-03-301-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For QWebEnginePage users to be able to make custom context menu or extend the default context menu, they need information about the context. This patch adds a QWebEngineContextMenuData class that contains contextual information when a context menu is being requested. This is also means we can finally generate a custom context-menu in the demobrowser the same way we did in QtWebKit. Task-number: QTBUG-51079 Change-Id: I695b8cbf648bdc7f119b0ed51ab685cf2f8de8e4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Add settings for FaviconManager's icon download modesPeter Varga2016-03-253-49/+105
| | | | | | | | | | | | Change-Id: I8e4b11089de29623ed39ec6b13fe30be734baa3e Task-number: QTBUG-51179 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 11:01:30 +0000