summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix broken rendering of select popups on macOSv5.10.0-rc3v5.10.0-rc2v5.10.0Alexandru Croitor2017-11-292-0/+3
| | | | | | | | | | Pass the kDisableNativeGpuMemoryBuffers flag to Chromium, so it does not generate GL_TEXTURE_RECTANGLE_ARB textures, which caused the rendering issues for popups. Task-number: QTBUG-64823 Change-Id: Ie7b5824eed870ce5c89ff66ba3309f85f9261c81 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Doc: Update Chromium versionv5.10.0-rc1Kai Koehne2017-11-231-1/+1
| | | | | Change-Id: Id7d695bc9acdcdb10cfedd039065e3e31025f46a Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Add GN_HOST_TOOLCHAIN_EXTRA_CPPFLAGSMichal Klocek2017-11-221-0/+3
| | | | | | | | | | | Add a way to add pass extra compilation flags when using host toolchain. This is currently used by yocto to get correct lookup path for native headers. Task-number: QTBUG-63140 Change-Id: Ic8f3e394840635b2a0a26acf593888e1f79439f6 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Add GN_PKG_CONFIG_HOST to set host pkg-configMichal Klocek2017-11-221-1/+3
| | | | | | | | | Yocto builds need to pass pkg-config-native to build natvie tools. Task-number: QTBUG-63140 Change-Id: I75ef77461b56bd599240da95df13261aa9e4be75 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add missing 'webengine' prefix in configure.jsonMichal Klocek2017-11-222-3/+3
| | | | | | | Fix condition mixup in webengine-system-lcms2 configuration Change-Id: Iff8513b1e1102c3ca6402b2ec346dfdded2c110a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge 5.10 into 5.10.0Oswald Buddenhagen2017-11-2053-332/+837
|\ | | | | | | Change-Id: I05f7952ea887536674045ed0779967e23388c5d1
| * Blacklist failing test_findTextInterruptedByLoad QML testAlexandru Croitor2017-11-181-0/+3
| | | | | | | | | | | | | | | | | | Continiously failed 5 times on Windows when integrating unrelated patches. Task-number: QTBUG-61887 Change-Id: I8055673e04c3bdfddfcfe05c3905ef5a86e8d1ec Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-11-1521-9/+314
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty tests/auto/quick/qmltests/qmltests.pro tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp Change-Id: I2a1e3a83e29a1d6709f3e98fda3f7b4ab7ab297e
| | * Merge remote-tracking branch 'origin/5.9.3' into 5.9Allan Sandfeld Jensen2017-11-142-0/+52
| | |\ | | | | | | | | | | | | Change-Id: Iceb6449776de31c9a2716ed83377ad432f2992b0
| | | * Update changes file with security CVEs for 5.9.3v5.9.3Alexandru Croitor2017-11-121-1/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I5ab44cf691c4a0fa4e7e96a8fe957dc849dc6f19 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * Add changes file for Qt 5.9.3Antti Kokko2017-11-121-0/+50
| | | | | | | | | | | | | | | | | | | | Change-Id: I032afc7d0784f5d755da1f93e8a621171f53bed9 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| | | * Update ChromiumAlexandru Croitor2017-11-121-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: a83d8cdb8d [Backport] Fix Stack Buffer Overflow in QuicClientPromisedInfo::OnPromiseHeaders Change-Id: I1a3f36a84d5f4838912bb5b6716f94282b064299 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * Update ChromiumAlexandru Croitor2017-11-091-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: c394f9bd67 [Backport] Ensure REG_SZ and REG_MULTI_SZ are null 180b9b53aa [Backport] IDN display: Block U+0307 after i or U+0131 4398e36a05 [Backport] Fix for CVE-2017-15396 [2/2] 8d7c3609b1 [Backport] Fix for CVE-2017-15396 [1/2] d95317e241 [Backport] Remove getOptimalLanguageTag logic 2d6e9c3fc4 [Backport] Fix for CVE-2017-15387 f84377a4e0 [Backport] Fix for CVE-2017-15386 ebccd98fb3 [Backport] Cherry pick: Don't allow iteration through da91cdeb1f [Backport] Fix for CVE-2017-5133 Change-Id: Ie85db1786594bac1feba2c7ca3e26559edfff7f2 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | | * Merge 5.9 into 5.9.3Oswald Buddenhagen2017-11-085-4/+40
| | | |\ | | | | | | | | | | | | | | | Change-Id: I2839bdbacad0836c16e9c04fcd33509e024c614c
| | | * | Update ChromiumAlexandru Croitor2017-11-081-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: 36d7224dff [Backport] Fix for CVE-2017-5124 3cc9c87e76 [Backport] Fix for CVE-2017-5129 ccaf2d569b [Backport] SkSafeMath for tracking size_t overflow 7b155d9f8d [Backport] Ensure IDN domains are in punycode format in extension host permissions fe7cc31259 [Backport] Fix for CVE-2017-5132 96c8d7944e [Backport] Fix for CVE-2017-5128 5de529d03d [Backport] Fix for CVE-2017-5127 edf0736427 [Backport] Fix for CVE-2017-5126 Change-Id: Ib0c76c846791f48820600ee5aaf55ca5389257bf Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | | Fix invalid Q_ASSERT in WebChannelIPCTransportJüri Valdmann2017-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-64419 Change-Id: I094cfc654498c74f4d6b656ec5647a90700a4f6a Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | | URLRequestQrcJobQt: remove ineffective URL formatting optionsJüri Valdmann2017-11-106-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove strange options for call to QUrl::path and add test for "qrc" protocol. Change-Id: I6528d858b7661832852c333a7f932d4714f953f2 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * | | Notify Chromium about leaving viewPeter Varga2017-11-098-3/+177
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Forward QEvent::Leave for Widget and QEvent::HoverLeave for Quick. Task-number: QTBUG-64265 Change-Id: Ide32768902956476d24b1d4115e305392b62feb3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | Do not stop findText on navigation if no finding in progressPeter Varga2017-11-074-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid unnecessary unselect calls to prevent to lose active focus on an input field during background load. Task-number: QTBUG-64082 Change-Id: I13e8e2a96254360a78329d6ea2b6858da86a2b5a Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
| | * | Fix position of keyboard-invoked context menu in QQuickWebEngineViewJoerg Bornemann2017-11-071-2/+31
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In QQuickWebEngineView the context menu is a QtQuickControls.Menu item. This menu is shown by calling popup() which always displays the menu below the mouse cursor. Work around the problem by moving the mouse cursor temporarily to the right position. Use a QObject property "pos" to store the requested menu position between addMenu() and showMenu() calls, because the Menu item doesn't have a "pos" QML property. Change-Id: Id772a0bb1a7548cad932e9f499ade68be32d86d3 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| * | Stop preserving aborted navigation entriesJüri Valdmann2017-11-146-57/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consider the scenario 1. user enters url "http://localhost:8000/" A new navigation entry is created and committed in the NavigationController. 2. user enters url "http://localhost:8000/download.bin" A new navigation entry is created and a download is triggered, but the pending navigation entry in the NavigationController is neither committed nor discarded (since our WebContentsDelegate's ShouldPreserveAbortedURLs() returns true). 3. user enters url "http://localhost:8000/download.bin" At this point the NavigationController will have "http://localhost:8000/" as the committed navigation entry and "http://localhost:8000/download.bin" as the pending entry. NavigateToPendingEntry will see that the user is trying to navigate again to the same URL as the last pending entry and will therefore identify this new navigation as a reload. However Blink interprets 'reload' to mean reloading the last committed entry, i.e. "http://localhost:8000/", and so we end up trying to download "http://localhost:8000/" instead of "http://localhost:8000/download.bin" as the user might have expected. The patch removes the ShouldPreserveAbortedURLs override and relies on the default implementation which always returns false. As a result the pending navigation entry in step 2 above is discarded once the download has been triggered and the unexpected behavior in step 3 is no longer triggered. Removing the override resurrects QTBUG-48995 where, for example, calling QWebEnginePage::setUrl triggers first a urlChanged signal for the *old* URL. The patch adds url and title properties to WebContentsDelegateQt so that property change signals are triggered only if the properties have actually changed. A consequence of this fix is that the first urlChanged signal is delivered directly from the setUrl/load method and not asynchronously once the loading starts (this is also how Chrome's URL bar is updated). Task-number: QTBUG-63388 Change-Id: Icfa300b165e5e56f1fbc8978a00a237c263df183 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| * | Add tests setUrlToBadDomain and setUrlToBadPortJüri Valdmann2017-11-141-0/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the somewhat strange behavior of the signals QWebEnginePage::urlChanged, QWebEnginePage::titleChanged, and QWebEnginePage::loadFinished when trying to load invalid URLs via QWebEnginePage::setUrl. Change-Id: I5218a49105ad6187f87e7091589b5175f4349593 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | Add 'webengine' prefix to configure features, tests, libraries, etcAlexandru Croitor2017-11-1224-258/+279
| | | | | | | | | | | | | | | | | | | | | | | | This is done to make sure there are no conflicts with features in other modules, because they all share a global namespace. Change-Id: I95b3b7fadd8ffc2979ee3aad2234ee543d57c7d8 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * | Fix widevine with proprietary codecsAllan Sandfeld Jensen2017-11-122-6/+7
| | | | | | | | | | | | | | | | | | | | | Switched from define to buildflag. Change-Id: I01b3e0aad7f54af1a485733e7d4ec25a31d14015 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | Update ChomiumAllan Sandfeld Jensen2017-11-111-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pulls in the third and final set of security patches from Chrome 62 Changes: 76dea3c3078e [Backport] Fix for CVE-2017-15386 12688c3d6eec [Backport] Fix for CVE-2017-15387 416280ca01fa [Backport] Fix for CVE-2017-15396 [1/2] b98a40d49b39 [Backport] Fix for CVE-2017-15396 [2/2] 74fbfc898f5b [Backport] mac: Make RWHVMac::ClearCompositorFrame clear locks a32345df103e [Backport] IDN display: Block U+0307 after i or U+0131 e77720eebe44 [Backport] Ensure REG_SZ and REG_MULTI_SZ are null terminated. 7e7cb8668680 FIXUP: Disable WebUI for chrome://accessibility to avoid crash d702e4b BASELINE: Update Chromium to 61.0.3163.140 b6e8bf1 Merge remote-tracking branch 'origin/upstream-master' into 61-based ef44fe2 [Backport] [turbofan] Remove obsolete LoadBuffer and StoreBuffer operators. 2366767 [Backport] Merged: [wasm] Fix Memory.grow when shared with asm.js modules Task-number: QTBUG-64027 Change-Id: I5dd00b2aa5c01260222c5ab6faa9f7621969a75e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | Make GetUserMediaTestPage more robustViktor Engelmann2017-11-081-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A 5 second timeout might not be enough for our underpowered CI VMs. Also, if the page isn't loaded (to slow or for other reasons), we must abort, to prevent the JavaScripts from being run on different pages (first scripts to the old page, then to the new page if it eventually finishes loading). The first JavaScript in particular is rejected on the old page, because "about:blank" doesn't have a secure origin. This could even make the test accept wrongfully if all scripts are run on the old page, because the request (which is supposed to be rejected) can be rejected for being run on the wrong page, instead of for requesting forbidden permissions. Task-number: QTBUG-63347 Change-Id: Ib63d55477d35001b174900b73dc3dd23d33c7263 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | Fill pointerType member of pointer eventsSzabolcs David2017-11-082-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pointerType of the currently supported (mouse and touch) events. Support of pen and eraser types is coming with QTBUG-62975. Task-number: QTBUG-63266 Change-Id: Ief32b9680ab5acfb15537aba74c2bcdd6f51c978 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| * | Doc: Rewrite AllowWindowActivationFromJavaScript docsLeena Miettinen2017-11-081-1/+2
| | | | | | | | | | | | | | | Change-Id: I1486542b2981e5ff16c9eed92c513b9ef7cdd795 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * | Unbundle pdfium librariesAllan Sandfeld Jensen2017-11-072-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | We now have gn flags to request unbundling of zlib and lcms2 in pdfium and can add those to our configure system. Task-number: QTBUG-61746 Change-Id: Iccc4c2a09b7b99121d79348f9e0636785b29f503 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | Remove double declaration of webengine-libxml2 featureAllan Sandfeld Jensen2017-11-071-5/+0
| | | | | | | | | | | | | | | | | | | | | It is declared twice for some reason Change-Id: I85b03c43909bec2f4f539f9716e188987d869f64 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | Add changes file for Qt 5.10.0Antti Kokko2017-11-151-0/+105
|/ / | | | | | | | | Change-Id: I688c3e9e474772a12099c5d9a5fd939f29cb637f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Update Chromiumv5.10.0-beta4Liang Qi2017-11-041-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pulling the second set of security fixes from Chrome 62 Changes: a0cde8fb2157 [Backport] SkSafeMath for tracking size_t overflow aada7e17ab01 [Backport] Fix for CVE-2017-5125 [1/2] 2ed76568020b [Backport] Fix for CVE-2017-5125 [2/2] ed460ed13d93 [Backport] Fix for CVE-2017-5129 32f182ef225f [Backport] Fix for CVE-2017-5124 e8e5f1815ea4 [Backport] Fix for CVE-2017-5131 a361fa754175 [Backport] Fix for CVE-2017-5133 bb283cc6493c [Backport] Cherry pick: Don't allow iteration through non-finite points. c34649b6774e FIXUP: Fix build with g++ < 6 Change-Id: I187e1e1a8a61985db5712b58cb72945bbfa3f480 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Pass editor shortcuts to Chromium by ForwardKeyboardEventWithCommandsPeter Varga2017-11-0313-185/+208
| | | | | | | | | | | | | | | | | | | | | | | | Moreover, extend the list of supported editor shortcuts and stabilize the corresponding auto test. Task-number: QTBUG-54692 Task-number: QTBUG-54812 Task-number: QTBUG-54221 Task-number: QTBUG-59053 Change-Id: I4dd8230519639ea6e3340992dbb54a609ecfcd91 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Update ChromiumAllan Sandfeld Jensen2017-11-021-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pulling in the first set of security patches from Chrome 62 Changes: 0e4f193bdcec FIXUP: Fix Chromium built with X11 running without 121ce3942568 [Backport] Fix for CVE-2017-5126 578e121bb3b0 [Backport] Fix for CVE-2017-5127 b332e4aa9c2d [Backport] Fix for CVE-2017-5128 96c14954df8e [Backport] Fix for CVE-2017-5132 ce3adfa592ed [Backport] Convert MediaTrackConstraints to a ScriptValue fa27f806d973 [Backport] Restore forward declaration of MediaTrackConstraints ccee9b733971 [Backport] Use no-referrer for DevTools links Task-number: QTBUG-64027 Change-Id: Iba6341b9dbdcaedb3df0370b01d5c532e9c31528 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix configure "native-spellchecker" feature descriptionAlexandru Croitor2017-11-021-1/+1
| | | | | | | | | | Change-Id: I4d11005b23554ef9e6a860b31d8b3a9741348090 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Fix libxml2 configure feature conditionAlexandru Croitor2017-11-021-1/+1
| | | | | | | | | | | | Change-Id: I874540e9d2f5033fae599e543fb398e7b1ad60c4 Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Change spellchecker-related private features into public onesAlexandru Croitor2017-11-028-9/+9
| | | | | | | | | | | | | | | | | | | | This is done because qtConfig(spellchecker) is present in an example .pro file, and thus "spellchecker" should be a public feature. Change-Id: Idff977b8d0835b049c4c19dc42c1475d2c55c323 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Remove pointless inclusions of qtwebengine-config.priAlexandru Croitor2017-11-026-6/+0
| | | | | | | | | | | | | | Only projects which are built before the actual module need to do that. Change-Id: Ia8b071a627bd39c5df4600877b6873f308cbf690 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Merge "Merge branch '5.9' into 5.10" into refs/staging/5.10Allan Sandfeld Jensen2017-11-0221-51/+327
|\ \
| * | Merge branch '5.9' into 5.10Allan Sandfeld Jensen2017-11-0121-51/+327
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/core/core_module.pro src/core/delegated_frame_node.cpp src/core/surface_factory_qt.cpp src/webenginewidgets/api/qwebengineprofile.cpp tests/auto/widgets/widgets.pro Change-Id: I92f3ef4eee779afef6c5381a7aa8b551417c1b17
| | * Destruct BrowserContextAdapter together with WebEngineContext in widgetPeter Varga2017-10-272-10/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BrowserContext needs IO thread to be destructed properly. Without WebEngineContext dependency it would be destructed together with the corresponding QWebEngineProfile which can outlive the WebEngineContext. Task-number: QTBUG-62147 Change-Id: Ia34215f379c6c803499848bf009e25a64b5cdb98 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Fix overeager freeing of resources in DelegatedFrameNodeJüri Valdmann2017-10-262-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After every run of DelegatedFrameNode::commit we take all the resources we didn't need and queue them for freeing. Problems appear however with the recent change that introduced clipping of invisible render passes and draw quads as we may now decide to release resources too early and eventually crash. Task-number: QTBUG-64032 Change-Id: I95138bc4c1caf8c191bfc801264309c5b03ef0f3 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | * Build accessibility tests only when Qt is configured with accessibilityMichael Brüning2017-10-261-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Original patch by Daniel Mack <daniel@zonque.org> Task-number: QTBUG-64015 Change-Id: I7dd0a1aa9bff08c6d19e818acf0e1b8b4b701f5b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * Fix qwebengine_convert_dict to pick up correct ICU resources locationAlexandru Croitor2017-10-261-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The conversion tool uses the QLibraryInfo::location() call to find Qt's data directory. When a qt.conf file gets picked up by the application (which is the case for official Qt packages), QLibraryInfo::location() depends on a QCoreApplication instance being available, to query the PrefixPath. If the instance is not available, it simply returns the current directory path, which results in ICU resources not being found. The fix consists in creating a QCoreApplication instance. Task-number: QTBUG-63593 Change-Id: I8f1bba14d4586c42570d309b84418eef611bab0e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Add off-the-record mode to simplebrowser exampleJüri Valdmann2017-10-257-15/+86
| | | | | | | | | | | | | | | | | | Change-Id: I9b87f870c4f6ad63142bc0497722b0c95095cd6b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Build recipebrowser only if QtQuickControls2 is availableJoerg Bornemann2017-10-201-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | This fixes the examples build if the QtQuickControls2 is unavailable. Task-number: QTBUG-63904 Change-Id: I2d5ff0920cc960af6df556543fd77abdc21d4a8a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * Fix favicons with queries or fragmentsAllan Sandfeld Jensen2017-10-201-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Set the parts of the URL after the path separately to avoid QUrl escaping the separators. Change-Id: I6d2be3e8737bdf6aad01107d68297711d75326d0 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| | * Revert "Use MSVC's /WHOLEARCHIVE linker flag"Joerg Bornemann2017-10-172-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6eae98639730ab1ad1611f1ea61bcaad2fe0f69a. The /WHOLEARCHIVE flag stopped working in VS 2017 15.4.0. Use our beloved list of object files again. Task-number: QTBUG-63701 Change-Id: I9eaf7c92012d6d3c73658f9e06d422c52fa1dc76 Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | | | | | Change-Id: I4b027ecb0c32205e180613962a0a3fa51f9c7cd9
| | * Merge remote-tracking branch 'origin/5.9.2' into 5.9Liang Qi2017-10-065-16/+126
| | |\ | | | | | | | | | | | | Change-Id: I22afdc6216c6cbe2e7c52b24ead0c9b694bee0b1
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 03:58:56 +0000