summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: edit QWebEngineUrlSchemeHandler docsLeena Miettinen2015-10-061-2/+11
| | | | | | | | | - Add missing docs - Edit for grammar Change-Id: I407818d66f17a354cf3f5051bed5a648bc807424 Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Doc: edit QWebEngineUrlRequestJob docsLeena Miettinen2015-10-061-9/+29
| | | | | | | | | - Add docs for the Error enum - Fix incorrect argument name - Edit for grammar Change-Id: I6c4364eb0a4dd52e38eaf1cde46aec4ddff99532 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Doc: edit QWebEngineView docsLeena Miettinen2015-10-061-57/+48
| | | | | | | Fix grammar, style, and punctuation. Change-Id: I0d6a8f9ccda16c81f7bc32194d09c5ca0e8761ce Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Doc: add docs for WebEngineView 1.2 APILeena Miettinen2015-10-061-0/+136
| | | | | | Task-number: QTBUG-48560 Change-Id: I65349be1696b75dc303ae15c81f57094eea0ede4 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Doc: WebEngineSettings as uncreatable typeLeena Miettinen2015-10-061-5/+7
| | | | | | Task-number: QTBUG-47911 Change-Id: Icea7a63e7d84ec23c98a6bcef4a8bdc624473572 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Document WebEnginePage API only available in WebEngine 1.1Kai Koehne2015-10-061-0/+3
| | | | | | Task-number: QTBUG-47907 Change-Id: Ib66038fa61e091cafc7c27a87ca59c4d68b48b48 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Doc: add docs for WebEngineSingleton typeLeena Miettinen2015-10-061-0/+36
| | | | | | Task-number: QTBUG-47912 Change-Id: Iabc06b4ce78eb81955d60cdebccef40fef9a21b3 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: add docs for uncreatable WebEngineHistory typeLeena Miettinen2015-10-061-0/+80
| | | | | | | | | | Accessible by using the WebEngineView.navigationHistory property. Task-number: QTBUG-47908 Change-Id: Ib1baaa7690b0ca16ee67e76bc9ea2ece3d254f55 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Remove unnecessay delegation over CustomUrlSchemeHandlerAllan Sandfeld Jensen2015-10-0616-200/+41
| | | | | | | | | | | With QWebEngineSchemeHandler in QtWebEngineCore, we do not need the indirection and delegation CustomUrlSchemeHandler provided. This means the class can be removed and we can also store the handlers directly in BrowserContextAdapter and save a copy of the installed handlers in the QWebEngineProfile. Change-Id: Iabb5cc9d364c2f2a879bc77bfb2ff14b3c2ff640 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* fix link error with MSVCJoerg Bornemann2015-10-061-1/+1
| | | | | | | | | | | Since qtbase/e88334e0 we must not put MSVC linker flags into LIBS or LIBS_PRIVATE. QMAKE_LFLAGS is the right place. This fixes a build error with MSVC: LINK : fatal error LNK1181: cannot open input file '\OPT:REF.obj' Change-Id: I2971e412dd8d5cfe8b7aca218d679dd136019dd8 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Fix assert on deleting installed custom URL scheme handlerAllan Sandfeld Jensen2015-09-304-5/+9
| | | | | | | | | | When the QObject::destroyed signal is emitted the inherited class parts have already been destroyed and thus it is no longer a QWebEngineUrlSchemeHandler and qobject_cast will return 0, which is asserted against. Change-Id: I7130c60a26088067930499a30e0081ed297a92d9 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Update to Chromium 45.0.2454.101Allan Sandfeld Jensen2015-09-303-1/+2
| | | | | Change-Id: Ifda982e1bcfc2a0655e65a71321b137a348be865 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Remove whitespaces from custom HTTP user agentsSzabolcs David2015-09-292-22/+11
| | | | | | | | | This prevents adding additional headers to the outgoing HTTP request through overridden user agent and unskips userAgentNewlineStripping API test. Change-Id: If9b3a88b0346058a7dc462471637d9777683fe82 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Doc: add requirements for building Qt WebEngineLeena Miettinen2015-09-292-0/+53
| | | | | | Task-number: QTBUG-48097 Change-Id: I81665b615c6bb2a21d355fa1310ff8c1fae7e0b2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Doc: edit WebEngineView docsLeena Miettinen2015-09-291-89/+63
| | | | | | | | - Edit for grammar and style. - Use QDoc commands consistently. Change-Id: Iecfeaa17307befee73057f1f7760d6e10ae79e77 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* update tst_publicapiJoerg Bornemann2015-09-281-79/+132
| | | | | | | Added QQuickWebEngineSingleton and updated the expected API list. Change-Id: If91aadd2353b94732da18734bdfe68fbf3245d53 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Correct demobrowser target on OS XAllan Sandfeld Jensen2015-09-281-1/+1
| | | | | | | We were still using Browser as target on OS X Change-Id: I0b526ad772651a3a54913e0830fc2f92fe2648c4 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix QT_NO_ASCII_CAST buildAllan Sandfeld Jensen2015-09-281-1/+1
| | | | | | | Use QStringLiteral for string literals. Change-Id: Ie5c105fac5e23bb323da5e0407874d25154ebe58 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* External URL supportAllan Sandfeld Jensen2015-09-285-1/+49
| | | | | | | | | | | | | | Support for launching external URLs such as mailto: They are also routed through navigationRequested like they would have been in QtWebKit. [ChangeLog][QtWebEngineCore] External links such as mailto: are now handled. By default they launch using QDesktopServices. Change-Id: I83ed96e2330d54cae57f03648d471a8da9a82a30 Task-number: QTBUG-47143 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Implement unload dialogsSzabolcs David2015-09-275-1/+15
| | | | | | | | | This fixes the assertion that occurs when the application should show "Are you sure you want to leave this page?" dialog. We can reuse the already existing confirm dialog implementations. Change-Id: I22466d450f39b54d9becbb69e1ecadb3b98697b0 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Signal that no positioning backend is availableKai Koehne2015-09-251-6/+11
| | | | | | | | | | | | | So far we didn't gave any hint that no positioning backend is available. This patch adds a qWarning(), and also signals the JS side that no positioning data is available. While at it, the unused bool return value of start() is removed. Change-Id: I9e3c21a9ea5c6ab94d230507fe7418fb01c7b86c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix khr autotest to work with non-standard locationsLaszlo Agocs2015-09-251-0/+4
| | | | | | | | | Just like the egl autotest in qtbase does, the paths have to be added from the respective QMAKE variables, otherwise the test will never pass on systems where EGL and friends are installed in a non-standard location. Change-Id: Idaa2136b5574f6f320abb8a7074350b5838b402e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Joerg Bornemann2015-09-2412-7/+77
|\
| * Merge remote-tracking branch 'origin/5.5' into 5.6Allan Sandfeld Jensen2015-09-2412-7/+77
| |\ | | | | | | | | | Change-Id: Ice3d6e88238940a62d75e7c67f63b626285fccb0
| | * Merge remote-tracking branch 'origin/5.5.1' into 5.5Allan Sandfeld Jensen2015-09-241-0/+47
| | |\ | | | | | | | | | | | | Change-Id: I003fe50e0ed39ba3e551543b1a43eb3e884500dc
| | | * Add changes filev5.5.1Allan Sandfeld Jensen2015-09-231-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | List the most relevant changes Change-Id: I8556f2081d6e88572f1a5ffa694d561d6986c3cb Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| | * | Fix httpUserAgent setting after the view's initializationSzabolcs David2015-09-241-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set user agent override on all WebContents of the specific BrowserContext. Task-number: QTBUG-47976 Change-Id: I4fc6f8d79aff6f372ca48d82642b3eab60f933d1 Reviewed-by: Jocelyn Turcotte (Woboq GmbH) <jturcotte@woboq.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * | Link with -ObjC to have ObjC categories workingAllan Sandfeld Jensen2015-09-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we don't link with ObjC, categories as used by Blink will not work and cause crashes at runtime when failing selectors. Change-Id: I81520cc46ed996377b86760232bc99e275e48ff3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * | fix metaobject signature of QWebEngineDownloadItem::stateChangedJoerg Bornemann2015-09-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to fully qualify enum parameters in signals/slots for the meta-object system. Otherwise the old QObject connection syntax will not work. Task-number: QTBUG-48309 Change-Id: I7a99d8a924ed3566c410c1c0ee7392e863fb2030 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| | * | enable OS X 32 bit buildJoerg Bornemann2015-09-211-1/+1
| | |/ | | | | | | | | | | | | | | | Task-number: QTBUG-48228 Change-Id: Ic8ee640316b95b2e7e2de9115330821dfae0e905 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| | * Fix assert on exitAllan Sandfeld Jensen2015-09-103-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove frame loading error-page when frame is deleted, and make sure WebContents is destroyed before the observer so the observer can observe the full live-span including deletions.. Task-number: QTBUG-47945 Change-Id: I56bec611b8bfbfc6f75a1bc2108efbc80a81729b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * do not generate qmake_extras.gypi in the source directoryJoerg Bornemann2015-09-094-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Among other things, we store the used compiler in there. This information belongs into the build directory. Otherwise switching toolchains becomes challenging. Task-number: QTBUG-43014 Change-Id: I9bec26a235f5251322792632d4667cc71210286d Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | | Fix dos2unixVersion error handling in take_snapshotMichal Klocek2015-09-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | dos2unix version 6.0.4 do not report version number on stdout, but to stderr, which breaks processing. Assume in that case that we have too old version anyway. Change-Id: Ifc945979a088558593091a8ef6b1a74e07334b66 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Mark qrc:// as a secure schemeKai Koehne2015-09-241-0/+6
|/ / | | | | | | | | | | | | | | | | This avoids deprecation warnings when using e.g. WebRTC (see also https://goo.gl/rStTGz ). Task-number: QTBUG-48272 Change-Id: Ib3d076ccc9eff0344d60f82b7671b047c0b3d423 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | fix debug_and_release build on WindowsJoerg Bornemann2015-09-243-17/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The public API symbols are compiled in a static library that's linked to core with --whole-archive when using gcc. There's no equivalent for this in MSVC. We hacked around this limitation in commit 38944be4 by creating a source file that includes every public header. Unfortunately this breaks debug_and_release builds, because we must inject this generated source file as absolute path, and gyp will generate the same object file for every source file that's specified with an absolute path... This reverts commit 38944be4 and replaces the work-around by simulating -whole-archive on MSVC. This is done by passing all object files that belong to qtwebenginecoreapi.lib to the linker via a response file that is created when building qtwebenginecoreapi.lib. Task-number: QTBUG-48376 Change-Id: Iaa991fe96a2c336d982d29d6924ce950c0be5398 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Add more required pkg-config packagesAllan Sandfeld Jensen2015-09-231-0/+3
| | | | | | | | | | | | | | These packages are required if Qt was build against them. Change-Id: I2b664229485dd764617d1683647951ab600768ed Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Support building on ARMAllan Sandfeld Jensen2015-09-231-36/+38
| | | | | | | | | | | | | | Fix ARM linux builds on ARM Change-Id: Ifd97a0286b509003d0c7959654d406e271349cd7 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Doc: Fix a number of documentation warningsTopi Reinio2015-09-232-25/+25
| | | | | | | | | | | | | | | | Fix minor language issues, and link to QML signals similarly as one would to a method. Change-Id: Ib9da8c66fd10c5543f5272f5bf6e1027e84b9a73 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: edit QWebEngineHistory docsLeena Miettinen2015-09-224-31/+24
| | | | | | | | | | | | Change-Id: Id52add61d11723e8bb12957af2f319a7d85bc69c Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Clarify unit of [set]HttpCacheMaxSizeKai Koehne2015-09-221-2/+2
| | | | | | | | | | Change-Id: I5db2aebf3cd300344bdafe8bba4169d54a0f3c24 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | DemoBrowser: Do not mention QtWebKit in descriptionKai Koehne2015-09-221-1/+1
| | | | | | | | | | | | | | | | | | WebEngine should stand on it's own by now. It is also arguably misleading to mention the word "WebKit" so prominently. Change-Id: Ibd1c98b12f5832d047e553098d6703699acf27d8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Use GYP_CONFIG over GYP_ARGSAllan Sandfeld Jensen2015-09-211-19/+19
| | | | | | | | | | | | | | | | Moves the handling of GYP_CONFIG down so that it may be used consistently for all GYP arguments in gyp_run.pro. Change-Id: Ic63d652701dbae4094572b2401d020fc058ea7ac Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Do not override use_system_ffmpegAllan Sandfeld Jensen2015-09-211-1/+1
| | | | | | | | | | | | | | | | We can use proprietary codecs with system FFMPEG if system FFMPEG is build with them. If both are set we should trust the configuration. Change-Id: I702dcdbed4b20405c7affa7af0d87ba446b44ca2 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Doc: edit QWebEnginePage docsLeena Miettinen2015-09-213-92/+154
| | | | | | | | | | | | | | | | | | | | - Add missing documentation - Edit for grammar and style - Fix links Change-Id: I9e8387fa08f8e7e73c636a516b1f87eb10973e73 Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Remove unnecessary test ifdefAllan Sandfeld Jensen2015-09-211-2/+1
| | | | | | | | | | | | | | We have settings and plugin setting now. Change-Id: Id999c20a0e1d5d2b7272207827de8fd31377ba01 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Update dependenciesAllan Sandfeld Jensen2015-09-183-9/+13
| | | | | | | | | | | | | | | | Add more pkg-config based libraries that we need to build Qt WebEngine and update Chromium SHA so that we do not need ATK. Change-Id: I713823e3dcad9b9f5a112d500d23281ac59c307b Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Disambiguate debug and release builds of libqtwebenginecoreapiKai Koehne2015-09-172-2/+4
| | | | | | | | | | | | | | | | | | | | Though the destination directory for a debug and a release build differ, the static library is still intermediately placed in a common directory. This patch adds a unique suffix to the library name to avoid clashes. Task-number: QTBUG-48287 Change-Id: I299704529539d0b7ed9aaf1df06245ae1c3ce363 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Unskip loadFinishedAfterNotFoundError test caseSzabolcs David2015-09-141-10/+6
| | | | | | | | | | Change-Id: Ie9f1aea1c7aad3e5a188667d1a38e5bc516564f8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Change some QNAM tests to use URLRequestInterceptorSzabolcs David2015-09-142-128/+103
| | | | | | | | | | Change-Id: I83536664df15375622e1b24496685ae19ab829c1 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Remove unnecessary QNetworkAccessManager test casesSzabolcs David2015-09-141-36/+0
| | | | | | | | | | Change-Id: I83b996740c96e8844f448cf4eb97593c6088a481 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 19:02:58 +0000