summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.4' into devPierre Rossi2015-01-1610-97/+125
|\ | | | | | | | | | | | | Conflicts: src/3rdparty Change-Id: Ied43de29444d4803218e250b096b9c72bc017af7
| * Refactor our build skipping logicPierre Rossi2015-01-161-23/+19
| | | | | | | | | | | | | | | | | | | | Move the logic to mkspecs to keep the .pro files robust. Add the basic infrastructure for config.tests, the first one of which will consistently ensure we have libcap on linux. Change-Id: Iee4207e747e589ba67d5353cb4c18f156e555c11 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| * Use paths relative to QtWebEngineProcess on OS X.Michael Brüning2015-01-151-2/+12
| | | | | | | | | | | | | | | | | | Fixes crashes of the QtWebEngineProcess on OS X 10.7 that were caused by the bundle paths not being returned correctly. Change-Id: Ic839978a6f1bff361cb76a3468bf978a738b6e82 Task-number: QTBUG-43181 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| * Make TLS1 the default minimum SSL protocol in Qt WebEngine.Michael Brüning2015-01-131-0/+0
| | | | | | | | | | | | | | | | | | | | This mitigates the risk of the POODLE vulnerability. Updates the 3rdparty submodule SHA1. Change-Id: I7557ecfd5f4f250a51e18432936b83502ba5d272 Task-number: QTBUG-43085 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| * Revert "Mac: INCLUDEPATH fix"Simon Hausmann2015-01-091-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a7da7f8ab00e6fe246ff8a02082305ea7f833fd3. Adding the install prefix to the inlude search paths causes us to pick up header files from there if there are any, which causes all sorts of issues. Conflicts: lib/lib.pro shared/shared.pro Change-Id: I070ff6443bb5612b3b7e3878d22dc9dd69d62e70 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
| * Tell the ContentMainRunner to not reset signal handlers in the browser process.Michael Brüning2015-01-082-0/+1
| | | | | | | | | | | | | | | | | | | | | | This prevents problems when QProcess::waitForFinished is used from the same application as QtWebEngine. Updates the src/3rdparty SHA1. Change-Id: I373456b1ef9f65e55b89acd877b15e7115516d6b Task-number: QTBUG-42747 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * Only deploy ffmpegsumo once in debug_and_releaseJocelyn Turcotte2015-01-071-51/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves all installs inside the the release-only-with-debug-fallback block to prevent the debug ffmpegsumo.dll to overwrite the release one on Windows (and get use for both debug and release builds). This will use the release version for both instead by default. This also moves the load(qt_module) call higher to make sure that build_all is added to CONFIG at that point. Change-Id: I2584a28e5eaaf5028798703fb387ac2b120d7ea9 Task-number: QTBUG-43348 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * UIDelegatesManager: Remove creationContextForComponent.Robin Burchell2015-01-062-15/+6
| | | | | | | | | | | | | | | | | | This doesn't seem to be too much sense, and according to the QQmlContext documentation, may not work as expected: "This is only valid for components created directly from QML." Change-Id: I49db5dad49288d196e8519b1a60dcf2192147672 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
| * UIDelegatesManager: Communicate load failure back to the dialog controller.Robin Burchell2015-01-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | If the dialog controller has asked to show a dialog, then if we cannot show a dialog, we should reject its request. Not doing this results in the WebView becoming frozen for input if the load fails, seemingly. Change-Id: I7dddd5357c712f896499cdebb142e60b5e80b4f2 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
| * UIDelegatesManager: Always print errors if component loading fails.Robin Burchell2015-01-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | This setting is useful when developing a new UI set, and one may not initially know about the suppression of errors, which is a painful problem to run into. Furthermore, make sure to delete the failed component so that subsequent attempted use of it doesn't succeed if UI_DELEGATES_DEBUG isn't enabled. Change-Id: I3d2abc19fb4a007d06795d2e8149ae78d7c9c020 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
| * Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2015-01-022-0/+25
| |\ | | | | | | | | | Change-Id: I155088b491e86d12eccf3c131acf9aad2dfd2a14
| | * OSX: Don't show QtWebEngineProcess in the dockv5.4.0Jocelyn Turcotte2014-12-022-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the LSUIElement key as Chromium does in its helper app's Info.plist to prevent seeing a jumping icon in the dock while the OS waits in vain for QtWebEngineProcess to create a window. Change-Id: I6c836621ec506fde04bc3825f64c49630a065351 Task-number: QTBUG-42955 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | Widgets: Implement mouse lock permission APISzabolcs David2015-01-169-3/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | If the user grants the permission with mouse click on the feature permission bar, the RenderWidgetHostView loses the focus but the focus is necessary for the pointer lock. Change-Id: Ifafd86b472e400c5690194dce2ea8a829a51c313 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | Add Pointer Lock supportSzabolcs David2015-01-1610-3/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While the mouse is locked, the cursor is hidden from the user and mouse events are still generated. The movement which is reported by the event indicates what would be the position change if the mouse would not have been locked. Change-Id: I79b3df5d7d644cd675a27e6c5a0da54e00b69da3 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devFrederik Gladhorn2015-01-1410-10/+60
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-0210-10/+60
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/3rdparty src/core/content_browser_client_qt.h src/core/core_module.pro Change-Id: Ia05a6564a4d17ca14ff9b76ae018c3f4ef33d535
| | * | Use QDir::separator() where paths might be generated for WindowsAllan Sandfeld Jensen2014-12-151-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Id7afc11cd58f671ff5ce629cfc29bdb6d9567dc2 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
| | * | Enable cmake config files generationJocelyn Turcotte2014-12-123-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As QtWebEngine now uses 5.x as its version number, we can just provide cmake tests and let qmake scripts do the rest. Task-number: QTBUG-42073 Change-Id: I28ccddbd1849980074dfbeefb5cb5a70c9209ab1 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| | * | Force active focus for touch beginAndras Becsi2014-12-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the focusing issues on touch devices. Change-Id: I26c0080ea70aeabbd608e15fbd3705b907bdb68e Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| | * | Check for EGL_KHR_fence_sync instead of EGL_KHR_reusable_syncAndras Becsi2014-12-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We create an EGL_KHR_fence_sync on the chromium thread but try to verify if the wait function implementation is available by testing for the EGL_KHR_reusable_sync extension in the scene graph thread. Since the latter extension is not supported by most of our devices, we never actually waited for the rendering to finish. Change-Id: Ied829d4035d42899cfb3f86de018bc48e61c0cc0 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| | * | Add a stub QuotaPermissionContext implementationSzabolcs David2014-12-042-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents the crash when the application requests persistent storage access using the Quota API (e.g. on http://codepen.io/matt-west/full/CrfKh). The request has been disallowed for now, because it should rely on user permission. Change-Id: I4ae057c9485d3f06f45a637c7eeda9dd69fe6b54 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| | * | Add class and enum documentation to QWebEngineCertificateErrorAllan Sandfeld Jensen2014-12-031-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without the class description the methods documentation was never generated. Change-Id: I0d7232e8f5cc6765908cb28b77d0fe0f514d359d Task-number: QTBUG-42996 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| | * | Flush UI message loop before quittingAllan Sandfeld Jensen2014-12-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cookies were not flushed on application exit because objects deleted lazy on the UI-thread never had their destructors called because we did not flush the queue on exit. Change-Id: If53cdb5547e15a9f39de8b99b1da313e307b1c90 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | | | Revert the version number in experimental back to 1.0Andras Becsi2015-01-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts the accidental version number update, since we provide no guarantees for the experimental API, we can update the version number as soon as we make the corresponding API public. Change-Id: I03d8ba83182f185bb42af0840880561d5e962043 Reviewed-by: Adam Kallai <kadam@inf.u-szeged.hu> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | | | Make Chromium use the same locale as QtAllan Sandfeld Jensen2015-01-133-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Tell Chromium to use the locale Qt has determined as the default locale. Change-Id: I16986d84afcc0b496a22441b4a92fc09a5c89121 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | | Do not allow desktop notificationsAllan Sandfeld Jensen2015-01-132-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default implementation of CheckDesktopNotificationPermission always allows desktop notifications. Until we have implemented them we want them always disabled. If we do not, we will end up with invalid cancel notification Closures being called. Task-number: QTBUG-41893 Change-Id: I609222d538ba6f3d1ac264eacd692211e4e653a7 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* | | | Add QML download APIAndras Becsi2015-01-1217-180/+594
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch exposes downloadStarted and downloadFinished signals on the WebEngineProfile to notify about downloads. The WebEngineDownloadItem exposes a subset of Chromium's content::DownloadItem functionality. For now we expose minimal requirements to be able to control downloads in QML but this can be extended in the future. This patch also adds a DownloadView to quicktestbrowser to demonstrate the usage of the new API. [ChangeLog][QtWebEngineQML] Add QtQuick download API Change-Id: I8d8f0daf02c4e0151000427fc2a4b37d28b9db52 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | | | API for controlling tracking of visited linksAllan Sandfeld Jensen2015-01-087-3/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes updating the visited links manager when off-the-record changes or a storage path is set or changed. Change-Id: Iffa90edde35f2d84146f3ab3b3861ef113e321f3 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | | Disable the GPU thread completely when Qt uses ANGLEJocelyn Turcotte2015-01-071-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ANGLE doesn't support multithreading and we already disabled WebGL and accelerated canvas drawing for that reason. It's still wrong to let the GPU thread do tile texture upload through ANGLE while Qt is using it in the scene graph thread for that reason, so ask Chromium to get tile images and let QtQuick do the texture upload itself instead. This means that Chromium will never use ANGLE directly for drawing and will fall back to its software compositing code path, but we still get hardware accelerated compositing by handing out delegated frames to QtQuick. Change-Id: Ia0bf9b8f6c462106866899f79a502ae161472122 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | | Do not use QDir::separator()Allan Sandfeld Jensen2015-01-075-15/+16
|/ / / | | | | | | | | | | | | | | | | | | | | | Build all paths Qt-style using / separators, and only convert it when converted to Chromium types. Change-Id: I181be6edb903f38e1772bcd324972d1d4e6672fc Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* | | Don't crash when using onEditingFinishedPierre Rossi2014-12-191-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to stay in line with the behavior expected by Chromium, we focus the view on load. This is problematic when relying on the editingFinished signal of text inputs in QML, as it is fired both when pressing enter and when losing focus. In our case, this would lead to reentering into load and in turn QQuickWindowPrivate::setFocusInScope, and when returning from the outer call, QQuickWindow would try to access the RWHVQtDelegateQuick from the first load through a now dangling pointer. It seems preferable to guard WebContentsAdapter::load against recursion. Adds a simple autotest that covers the crash scenario. Task-number: QTBUG-42929 Change-Id: Ib3bf9f421b1a91645b3e0e9aa658f2a3646d9caf Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* | | Make deserializeNavigationHistory staticPierre Rossi2014-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | Fixing up an oversight. Change-Id: Ie09a93380b56b5f9314f43206eedbd5f1f36f2a2 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | QML API for WebEngineProfilesAllan Sandfeld Jensen2014-12-1210-12/+516
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduces the QML API for the WebEngineProfiles already implemented for QtWebEngineWidgets. [ChangeLog][QtWebEngineQML][QQuickWebEngineProfile] New API for profiles applying to groups of QQuickWebEnginePages. Change-Id: Ideccddb9f1fb19628297592fe0cec504c9890e46 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | Introduce QWebEngineProfile APIAllan Sandfeld Jensen2014-12-1217-142/+969
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduces initial widgets API for the Chromium BrowserContext. Adds API for controlling cookie jar policy, user-agent string and cache and persistent data paths. Similar QML API will follow in another patch. [ChangeLog][QtWebEngineWidgets][QWebEngineProfile] New API for profiles applying to groups of QWebEnginePages. Change-Id: I3c4ef4053fde7564af29178c91a0aca8a2b61a5f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | | Enable running on the wayland platform pluginLaszlo Agocs2014-12-041-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I472279f6f391b036f5af9eb6a07f6803b3786320 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | Use in-memory caches for off-the-record browsingAllan Sandfeld Jensen2014-12-034-21/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | Off the record should leave no record, which means we should not use disk storage for cookies and cache but instead trigger memory caching. Change-Id: I3e14ed0f91f925bc65675d2e7d9f07eb379a30b0 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | | Merge remote-tracking branch 'origin/5.4' into devAndras Becsi2014-12-0119-47/+309
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/access_token_store_qt.cpp src/core/access_token_store_qt.h src/core/content_browser_client_qt.cpp Change-Id: Id319ad0d87ce071e63d9c6c22b4fc35523ddfa74
| * | Fix deployment problems with developer buildsPeter Varga2014-11-284-2/+47
| |/ | | | | | | | | | | | | | | | | | | | | This fix deploys the following files into qtbase without make install: - qtwebengine_resources.pak - translations/qtwebengine_locales/*.pak - icudtl.dat - plugins/qtwebengine/libffmpegsumo.so Change-Id: Id2c02f03fb01571942d3135b215ebb8ad7a3221b Reviewed-by: Andras Becsi <andras.becsi@digia.com>
| * Disable using the ICU data file on embedded linuxAndras Becsi2014-11-241-0/+1
| | | | | | | | | | | | | | | | Since we use the system ICU we do not need the extra data file. This fixes a crash caused by missing icudtl.dat file. Change-Id: Ic7a6ad83d6595ea3a89c736c281499636b05945e Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
| * Use a relative install_name for QtWebEngineProcess' dependenciesv5.4.0-rc1Jocelyn Turcotte2014-11-201-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until we can rely on Qt using @rpath on OSX, QtWebEngineProcess' dependencies must either be updated by macdeployqt when creating an .app bundle, either we must make that path relative at build time. Since QtWebEngineProcess.app is always deployed inside QtWebEngineCore.framework, we can safely assume that the dylib is always in a parent directory and that QtCore.framework can be found one directory higher. The additional dependencies of QtWebEngineCore.framework will be handled by the dynamic linker when it gets loaded, but this only works for QtWebEngineProcess when macdeployqt uses @loader_path instead of @executable_path (then relative to the application which is in a different directory than QtWebEngineProcess). This can be forced by passing a non-empty value for its -executable= command-line argument (e.g `macdeployqt Browser.app -executable=Browser.app/Contents/MacOS/Browser`) All this will be much simpler once we got Qt framework builds to use @rpath instead in a future minor version. Task-number: QTBUG-41611 Change-Id: Ied46c65a09f7033b622708da6e3d85855f9abf34 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
| * Doc: Fix issues related to example docsTopi Reinio2014-11-171-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | - Add documentation for Quick Nano Browser - Add all examples to the correct group - Add instructions to run the examples - Qt WebEngine Widgets index page: Add examples section Task-number: QTBUG-42668 Change-Id: Ie60f8708336b9c147d0c22afb555fe87287deddc Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| * Add missing header guardsPierre Rossi2014-11-152-0/+8
| | | | | | | | | | Change-Id: I67d0040c2e9f00e8a7b842ac1228212c0e93873c Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| * Process touch events in sorted order.Zeno Albisser2014-11-121-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are mapping a single QTouchEvent to multiple MotionEventQt for Chromium. For gesture recognition it is important that these motion events are being processed in a sorted manner, as a move event might trigger a different gesture depending on how many ACTION_DOWN or ACTION_POINTER_DOWN were received before. It is particularly illegal to process an ACTION_MOVE with multiple touch points without having received a ACTION_POINTER_DOWN before. Change-Id: I75d22dd845774a14b5f590e0e0ce46263c4a49f4 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
| * Add a stub AccessTokenStore implementation.Robin Burchell2014-11-125-0/+122
| | | | | | | | | | | | | | | | | | Callers inside Chromium expect an implementation of AccessTokenStore to exist. This fixes crashes with the geolocation-based APIs, exposed on e.g. google.com when faking an Android UA (as well as other places, probably). Change-Id: I45e6b483e096d5165fefd86927cdf34e799cc4d9 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
| * Disable accelerated 2D canvas rendering with ANGLEJocelyn Turcotte2014-11-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ANGLE isn't thread-safe and we're already taking a risk by letting Chromium do texture upload from the GPU thread with a shared GL context. Any kind of drawing happening concurrently between the GPU thread and the Qt scene graph thread might currently end up drawing on the same device context and this is creating visual artifacts and Direct3D errors. We're already disabling WebGL but we should also disable accelerated 2D canvas rendering to lower that risk. We should ultimately disable ANGLE from within Chromium or fix multithreading issues to properly support GL rendering scenarios across threads. Task-number: QTBUG-41627 Change-Id: I37a7a778f0e1066a454f51bb38e98df4dea8767e Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Merge "Merge remote-tracking branch 'origin/5.4' into 5.4.0" into ↵Jani Heikkinen2014-11-107-26/+43
| |\ | | | | | | | | | refs/staging/5.4.0
| | * Merge remote-tracking branch 'origin/5.4' into 5.4.0Oswald Buddenhagen2014-11-107-26/+43
| | |\ | | | | | | | | | | | | Change-Id: I01615a492c958bf123deeef5d2ddf9fb01b1a9d0
| * | | Update snapshot sha1 to include various crash fixes for the release.Andras Becsi2014-11-101-0/+0
| |/ / | | | | | | | | | | | | Change-Id: I2d04e910c7a08e1c630bc490d1f8b1be3d27a6f1 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| * | Fix crashes in QQuickWebEngineSettingsPeter Varga2014-11-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Remove QQuickWebEngineSettingsPrivate object's pointer from the global setting list before the object is destructed. Change-Id: I1cca6bf8aa2438903692d9e2ef863c8fc543adbd Reviewed-by: Andras Becsi <andras.becsi@digia.com>
| * | Deploy external data in QtWebEngineCore.framework for framework buildsJocelyn Turcotte2014-11-064-16/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is currently no convenient way to deploy QtWebEngine into an application bundle on OSX. macdeployqt copies frameworks into a .app bundle's Frameworks directory but this makes no sense unless all the needed files are also distributed with the bundle. This patch moves: - The ffmpegsumo.so library into Libraries/ - Locale .pak files, qtwebengine_resources.pak and icudtl.dat into Resources/ - QtWebEngineProcess into its own .app bundle, itself into Helpers/ QMAKE_BUNDLE_DATA is used to copy files into the bundle while INSTALLS is used when installing normally. A LOCALE_LIST is explicitly listed since QMAKE_BUNDLE_DATA can't handle the * glob to match all source files. Change-Id: I5c0df57b4b9e93f9cce34a74a6e024bf90d37b5c Task-number: QTBUG-41611 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 11:07:32 +0000