summaryrefslogtreecommitdiff
path: root/examples/webenginewidgets/simplebrowser/webview.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Fix crash on context menuAllan Sandfeld Jensen2017-02-221-1/+0
| | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-06-111-0/+1
|\ | | | | | | Change-Id: Ib010ede9756fb02992a3276ae7ec90ef1ab56a00
| * Fix build of webenginewidgets/simplebrowserJoerg Bornemann2016-06-101-0/+1
| | | | | | | | | | | | | | | | | | Add missing include to fix error C2027: use of undefined type 'QDebug' on MSVC. Change-Id: Icc62cdf36f417f30691445ab4994b822c8e37db9 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Change messagebox in simplebrowser exampleMichal Klocek2016-05-091-2/+5
| | | | | | | | | | | | | | | | In case of render epic fails, let the user leave the loaded page with dignity. Change-Id: I27f692fc0bb181c1d4f7ce43f5772d5573d7e385 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-04-251-2/+4
|\ \ | |/ | | | | Change-Id: I329397621f19ba3890be5daf44a6bb2d668ad2d8
| * Fix contextMenu handling in examplesMichal Klocek2016-04-211-2/+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>
* | SimpleBrowser: Use new QWebEnginePage::icon APIKai Koehne2016-04-201-43/+1
| | | | | | | | | | | | | | Change-Id: I38d16a57116517aee21f6f84c5fca82192cb1572 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* | SimpleBrowser: Handle WebBrowserBackgroundTabKai Koehne2016-04-071-0/+4
|/ | | | | | | | | | | Fix compilation warning: qtwebengine/examples/webenginewidgets/simplebrowser/webview.cpp:131: warning: enumeration value 'WebBrowserBackgroundTab' not handled in switch [-Wswitch] switch (type) { ^ Change-Id: I590207c56525db740e62403b6cb949c6281d765c Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* Strip down demobrowser to become simplebrowserMichal Klocek2016-03-161-0/+189
Demobrowser changes: * remove QLocalServer/Socket * remove AutoSaver * remove restoreLastSession * remove general QSettings * remove downloadManager * remove bookmarkManager * remove historyManager * remove searchBar * favor setStyleSheet over overriding paint methods * use lambdas where suitable * use QProgressBar instead of own painted widget * use QToolButton instead of own painted buttons * remove QStackWidget, use single UrlLineEdit per window instead of per tab * split files to keep own classes: webpage and webview * remove tracking windows by QPoiner * remove WebPageActionMapper, TabBar classes * remove QDrag dead code * remove special OS X close app handling * fix encapsulation, clean up application logic Change-Id: I4849b6a2de739dea4f01229abdb90418601a2397 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com>
View Lorry Controller Status