summaryrefslogtreecommitdiffstats
path: root/src/core/web_engine_context.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Use QOpenGLContext::isOpenGLES() to check if OpenGL ES is enabledSiteshwar Vashisht2015-12-211-7/+9
| | | | | | | | | | | | | | QOpenGLContext::openGLModuleType() performs a general check whether OpenGL ES support is enabled or not. However it is possible that a specific OpenGL context does not have OpenGL ES support enabled even when QOpenGLContext::openGLModuleType() returns QOpenGLContext::LibGLES. In such situations QOpenGLContext::isOpenGLES() method is correct way to determine if the context is an OpenGL ES context. Task-number: QTBUG-50015 Change-Id: I319c2932a62027d3142040045a46cdcb12fcdebe Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Replace QList with QVectorKai Koehne2015-11-061-1/+1
| | | | | | | | Replace QList with QVector in all places where the type isn't a pointer, and is not already (indirectly) exposed through public API. Change-Id: I90e3db56bf9ebda6b3cb8fb4396d2ae283159727 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* fix crash on exit when using the inspectorJoerg Bornemann2015-09-011-0/+1
| | | | | | | | | Destroy the DevToolsHttpHandler early on, because ~DevToolsHttpHandler assumes the browser's UI thread is still running. This fixes a crash on exit in tst_inspectorserver. Change-Id: I98476231b709d60c249e58e17b09de70aed6792b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Merge branch '5.5' into 5.6Allan Sandfeld Jensen2015-08-181-1/+18
|\ | | | | | | Change-Id: I9977663123560a22f493b8c02d02de8897b38666
| * Fix single-process modePeter Varga2015-07-141-1/+18
| | | | | | | | | | | | | | | | | | | | Destroy RenderprocesHostimpl first then the WebEngineContext. RenderProcessHostImpl's destructor may use the default BrowserContext stored by the WebEngineContext. Task-number: QTBUG-45722 Change-Id: Ide8875a89bd339ecf65ddd32a5f00842102c1c43 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Remove --enable-viewport-meta switch on embeddedAndras Becsi2015-07-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | This breaks the initial scale of some pages on embedded Linux and is mostly tied to Android codepaths in chromium and might be removed soon from public switches. See: https://code.google.com/p/chromium/issues/detail?id=513214 and: https://code.google.com/p/chromium/issues/detail?id=232102 Change-Id: I9eb6577bcc9c3aeb583ac6576e9de34c230c36c3 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Merge Chromium 44 and fixesAllan Sandfeld Jensen2015-07-061-6/+4
|\ \ | | | | | | | | | | | | | | | | | | Bumbs the Chromium version to 44 and merges the 'wip/44-based' branch, which contains all the patches to build against Chromium 44. Change-Id: If03dd301cb2a5cf7da3fe0a92ce1134f1239bf00
| * | Other changes for Chromium 44Allan Sandfeld Jensen2015-07-011-1/+0
| | | | | | | | | | | | | | | | | | | | | Minor changes for Chromium 44 that didn't fit in anywhere else. Change-Id: I569422239acd077e33e1878a1d5dc7afeac0bea6 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| * | Update remote inspector for Chromium 44Allan Sandfeld Jensen2015-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Handle changes in modules, API and ownership of inspector related classes. Change-Id: I8faa7f22b50828edeac450cc34c151fbb2c45a0c Reviewed-by: Jocelyn Turcotte (Woboq GmbH) <jturcotte@woboq.com>
| * | Trivial changes for Chromium 44Allan Sandfeld Jensen2015-06-231-3/+3
| |/ | | | | | | | | Change-Id: I8261b201f1d6623eff3427b68b8d098c17d293d3 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* / Make it possible to run applications with chromium embedded optionsAndras Becsi2015-06-301-15/+19
|/ | | | | | | | | | | | This patch adds --enable-embedded-switches command line switch to enable all the embedded switches on startup instead of during compile time. Among others this enables pinch-zoom, viewport and impl-side painting, to make it easy to run an application with these settings even if the library was not cross-compiled. On embedded these are enabled by default and can be disabled by --disable-embedded-switches. Change-Id: I366ed243f1b0e17cbeb900e672d0e15fb4a2b8b0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Remove eAndroid hooksAndras Becsi2015-04-141-7/+0
| | | | | | | | Support for the B2Qt/eAndroid platform is discontinued with Qt 5.5 so we can remove all remnants of the android platform. Change-Id: I93f15fcd4a345203e15010ddf1e8de3e8d28ab56 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Clean up global profiles and ownershipAllan Sandfeld Jensen2015-03-121-4/+6
| | | | | | | | | | | | | This patch removes the unused global off-the-record browser-contexts and changes all browser-contexts to be ref-counted by an API level profile. The API default profiles are now owned by a global QObject and are deleted on exit. Change-Id: Id7c9eafa24829118105f58b66663a6348216823d Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Add namespace to internal QtWebEngine APIAllan Sandfeld Jensen2015-03-021-0/+2
| | | | | | | | Adds the QtWebEngineCore namespace to all internal core API. This ensures we don't export any internal symbols in the global namespace. Change-Id: I26af888ea7c6c4c4d0f04c24a377c1a9d3c92751 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Fix the build on eLinuxAndras Becsi2015-02-201-5/+3
| | | | | | | | | | | | | Update ozone layer to the new snapshot, update the embedded_linux.pri configuration, fix the GLSurfaceQt build on non-x11 linux and update embedded command line switches for the 40.0.2214-based chromium snapshot. This patch also updates the snapshot sha1 to include required chromium changes. Change-Id: I7f9446fa1b67a0af7baee564acff41ae33ff1a94 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-161-7/+7
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: Ieb6bac7a1be5c25eb7cb917495b58b6a870ca6d4 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* [Windows] Enable WebGL and accelerated 2D Canvas.Michael Brüning2015-01-231-9/+0
| | | | | | | | | Now that we are using Chromium's SW compositor when using an ANGLE-based Qt build, it should be safe to re-enable those. Change-Id: Ib87ef38a5a381a389fef7e092328c9c5d116aa4e Task-number: QTBUG-42182 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Replace the inspectable property with an environment variableJocelyn Turcotte2015-01-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation would enable or disable the inspector globally when the inspectable property was set on a WebEngineView, overwriting the value previously set by other pages. Instead of havind default port for the debugging server and having to enable debugging on individual pages, use an environment variable, QTWEBENGINE_REMOTE_DEBUGGING, to enable the debugging server for the whole application at the same time as specifying the port. The format is the same as for QTWEBKIT_INSPECTOR_SERVER in QtWebKit. QTWEBENGINE_REMOTE_DEBUGGING is set by default in quicktestbrowser to ease development. This also keeps the input reading from the --remote-debugging-port command line switch for convenience, but its usage should be considered internal. This patch also take the opportunity to remove the unused DevToolsHttpHandlerDelegateQt::m_browserContext and to move the ownership from ContentBrowserClientQt to WebEngineContext since the list of inspectable pages isn't bound to the BrowserContext anyway. Change-Id: I772687f88f4feee0cc14dd182b0129cc0ea384dd Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Fix gcc warning 'may be used uninitialized'Andras Becsi2015-01-201-1/+1
| | | | | | | Initialize glType to make gcc happy. Change-Id: I558ac822666d54a623e68cd2182895b05ba410c0 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Update Chromium to version 40.0.2214.28 and ninja to 1.5.3.Zeno Albisser2015-01-201-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * scoped_refptr operator for implicit conversion to pointer has been disabled upstream: https://codereview.chromium.org/510323002 * Group permission API as done upstream: https://codereview.chromium.org/622793002 * content_worker gyp target has been removed upstream. * GetPageThumbnailData moved to DevToolsManagerDelegate. * ui/ui_resources has been renamed to ui/resources * WebPreferences and ResourceType have moved inside content. * Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale(): https://codereview.chromium.org/457103003 * Remove obsolete accessibility events. * AX_EVENT_SELECTED_TEXT_CHANGED has been renamed to AX_EVENT_TEXT_SELECTION_CHANGED * AX_ROLE_MATH_ELEMENT was removed upstream. https://codereview.chromium.org/695133002 * Screen::IsDIPEnabled has been removed upstream. https://codereview.chromium.org/672823002 * Update DevToolsHttpHandlerDelegateQt according to ShellDevToolsManagerDelegate. * Various functionality from DevToolsHttpHandler was moved to DevToolsManagerDelegate https://codereview.chromium.org/560323005 * DevToolsHttpHandler::Start expects a scoped_ptr now. * Make sure event_factory_evdev.h is not included when USE_OZONE is not defined * ErrorPageParams was moved into namespace error_page. * Media Access is now handled by ContentBrowserClient::CheckMediaAccessPermission * SpecialStoragePolicy moved to namespace storage * Add implementation for new pure virtual function BrowserContext::GetSSLHostStateDelegate. * RenderPass::Id was renamed to RenderPass::RenderPassId * Include view_messages.h for ViewHostMsg_TextInputState_Param * CERT_UNABLE_TO_CHECK_REVOCATION has been deprecated by Chromium: https://codereview.chromium.org/449743002 * MailboxManager::ConsumeTexture only takes the mailbox as an argument * Replace RWHVQt::TextInputStateChanged with RWHVQt::TextInputTypeChanged. * RenderWidgetHostView::ScrollOffsetChanged has been removed. * SkBitmap::Config was removed upstream. * CopyFromCompositingSurfaceCallback has become an own type. * AcceleratedSurfaceInitialized only takes route_id as an argument. * ServerBoundCertService has been renamed to ChannelIDService. Related API has been renamed accordingly. * TextureImageTransportSurface was removed upstream. * Update MediaCaptureDispatcher::OnMediaRequestStateChanged signature. * AudioStream related functions are gone upstream. https://codereview.chromium.org/569713002 * Add implementation for RenderWidgetHostViewQt::GetLastScrollOffset. * Include generic touch_device implementation. * switches::kDisableDesktopNotifications was removed upstream. https://codereview.chromium.org/607843002 * PageTransition moved to ui. * Messages headers are not guarded. Including them multiple times does hurt. * ScaleGestureDetector does not create a standalone GestureDetector anymore. https://codereview.chromium.org/501503003 * MotionEvent::Cancel and Clone are not virtual anymore. https://codereview.chromium.org/502993004 * Exclude os_exchange_data_provider_mac from build. * Remove argument from ScopedClipboardWriter ctor. https://codereview.chromium.org/558913003 * Remove ShowPopupMenu override from WebContentsQt. The function is not pure virtual anymore, and we never implemented any specifics. * Do not use clang on desktop linux. * Request functions in ContentBrowserClient were merged into RequestPermission. * ninja: use configure.py --bootstrap instead of bootstrap.py Change-Id: I3575612826db7845461a949b4e737264bb4e8d88 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into devPierre Rossi2015-01-161-0/+1
|\ | | | | | | | | | | | | Conflicts: src/3rdparty Change-Id: Ied43de29444d4803218e250b096b9c72bc017af7
| * Tell the ContentMainRunner to not reset signal handlers in the browser process.Michael Brüning2015-01-081-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>
* | Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devFrederik Gladhorn2015-01-141-0/+4
|\ \
| * | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-021-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/3rdparty src/core/content_browser_client_qt.h src/core/core_module.pro Change-Id: Ia05a6564a4d17ca14ff9b76ae018c3f4ef33d535
| | * 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>
* | | 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>
* | Introduce QWebEngineProfile APIAllan Sandfeld Jensen2014-12-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.4' into devAndras Becsi2014-12-011-0/+4
|\| | | | | | | | | | | | | | | | | 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
| * 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>
* | Make BrowserContext name configurableAllan Sandfeld Jensen2014-11-261-2/+2
| | | | | | | | | | | | | | Add a name to BrowserContexts to separate cookies and cache paths. Change-Id: I3f00444dc7e87d1a63383053e91a4bc7056553bb Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Disable the GPU process in cases where we can't setup context sharingJocelyn Turcotte2014-11-251-9/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This explicitly disables WebGL and automatic Resource transfer through GL context sharing in cases that we know this won't work. This is currently the case for the QtQuick 2D Renderer as well as when using llvmpipe on Windows. It could be possible to get Chromium to use GL through opengl32sw.dll but the change would be more intrusive. Fall back to the Chromium software compositor code path in that case at the cost of losing WebGL support with llvmpipe. Change-Id: I9c1d27ed982dccbe005c8742162c343cc6284e74 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into devAllan Sandfeld Jensen2014-11-111-0/+1
|\| | | | | | | | | | | | | | | Conflicts: src/core/browser_context_qt.cpp src/webengine/api/qquickwebengineview_p.h Change-Id: I73bdec03b627b282851d7dda12006d4ab631072c
| * Disable Desktop Notifications.Michael Brüning2014-10-141-0/+1
| | | | | | | | | | | | | | | | | | This should be removed once desktop notifications have been implemented. Task-number: QTBUG-41893 Change-Id: Ia004ee8946ae4441027161f5dddf05d304df8b1b Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* | Unglobalize browserContextAllan Sandfeld Jensen2014-11-061-6/+12
|/ | | | | | | | | | | | | | This patch makes it possible to have more than one BrowserContext, for instance for off-the-record browsering but also to enable any other configuration on browser context level. This will make it possible to add page-groups settings and API for settingsthat can only be done on BrowserContext level. This patch does not expose any new API. Change-Id: I0a0e194449cfb5a096a4ac6e2f2b3882b6b4cfa2 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Add Desktop OpenGL backend for WindowsKai Koehne2014-09-251-4/+11
| | | | | | | | Enabling rendering into a WGL backbuffer, in addition to the EGL/angle one. Change-Id: I8f2e3f5ecf52b6db22712b1129059f462725a256 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix the build for embedded androidAndras Becsi2014-09-151-9/+4
| | | | | Change-Id: I1edd16e6875198d7480897e7b2e2fbf68b245883 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* [Win] Enable multiple processes again.Michael Brüning2014-09-021-2/+0
| | | | | | | This seems to work well with the Chromium 37-based snapshot. Change-Id: If7640bf7f2428db12eb2bd01707ef82df9014cf2 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Update License Headers for Qt WebEngine to LGPLv3.Zeno Albisser2014-08-211-15/+10
| | | | | | | Change-Id: Idbe0eafb51d77cc00e3a93179b81770724d5bfaa Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Update the QtWebEngineCore library to run on top of Chromium 37Jocelyn Turcotte2014-08-141-14/+12
| | | | | | | | | | | | | | | Most of the patch is about upstream classes/methods that changed. Other important details: - icu data files are now used by default - cygwin is no longer required to build on Windows - RenderFrameHost has been replacing RenderViewHost in a few places, following the separate process iframes support in Chromium - The user agent is accessed through ContentClient::GetUserAgent instead of from the command line switches Change-Id: I86cc93aff7ce31176a80b0b4a5d54025674a451c Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Use VisitedLinks component.Pierre Rossi2014-08-081-0/+9
| | | | | | | | | This allows to resolve visited links in the render process. The newly introduced API at the Core layer should allow exposing this functionality to our widgets and Qt quick API layers. Change-Id: I256376afcfe79014dc274e2dddbac1986a884a93 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Disable unstable features on Windows.Michael Brüning2014-07-301-0/+2
| | | | | | | | Both WebGL and D3D11 in the ANGLE layer are buggy in QtWebEngine on Windows due to the usage of OpenGL from different threads. Change-Id: Ia7ee7ced7cad6b09d862ca5fa897a7184b9de298 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Windows: Use single process binary on Windows and fix GL contextPeter Varga2014-05-211-0/+5
| | | | | Change-Id: Iee7f3dc7fb9deba03e57a80ed48b74069490fe0d Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Buildfix after Iacc6cff82c0f071d1c8901977748d6164fb0a87d.Zeno Albisser2014-05-201-0/+2
| | | | | | | We only do have the scoped_ptr m_surfaceFactory on Android. Change-Id: Ia377afa9a8662498fca005994bd5fbec5c41bc9e Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Use the same switches for both embedded Linux and AndroidJocelyn Turcotte2014-05-191-2/+3
| | | | | | | | This also explicitly enables impl-side painting, which is enabled by default on Android, hard-coded behind an #if defined(OS_ANDROID). Change-Id: Iacc6cff82c0f071d1c8901977748d6164fb0a87d Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Fix jerky pinch-zoomingJocelyn Turcotte2014-05-191-1/+0
| | | | | | | | | | | The kEnableScrollPrediction switch uses event timing to extrapolate events but this considerably reduces the smoothness of pinch-zooming. Assuming that this feature expects very well timed events, which we don't have in most of QPA platform plugins, disable the feature. Change-Id: I96bdd8b9e9cc870e232ad9c98bcad5857608870b Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix a crash preventing us from using ImplSidePaintingJocelyn Turcotte2014-05-161-1/+0
| | | | | | | | | | | | | | Because of an uninvestigated reason, ImplSidePainting can cause more than one quad to use the same resource_id in one delegated frame. Fix the issue by first checking if m_data->mailboxTextures contains a texture for the resource_id before overwriting it. This also re-enables the feature on OS_ANDROID where it is enabled by default. Change-Id: Ie7842f958e1c049db71ffc2a0a768a5725102a3d Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Set the QtWebEngine modules version to 0.9.0Jocelyn Turcotte2014-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | Also make sure that this version number appears in the user agent string and in the QML imports. The plan, unlike other Qt modules, is to keep our module and QML versions in sync to make it easy for developers to figure out what API is available in a given version. The QTWEBENGINECORE_VERSION_STR define is explicitly set in the .pro file since we don't call syncqt to generate a version header for the core module. The 0-major version currently causes the library name to start with libQt0 instead of libQt5, but this is something that we can fix in qtbase once we want to officially support linux desktop with QtWebEngine 1.0.0. Change-Id: I31915e84869b4db456416ef1f85a2296b8a06c99 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Enable GLContextHelper and register a SurfaceFactoryQt on eAndroidAndras Becsi2014-05-151-0/+7
| | | | | | | | | | | | This is needed to run on certain hardware that needs the shared EGL contexts to be created on the same thread. To prevent a deadlock on eAndroid only use a blocking connection if we are not on the main thread where the singleton was created, since there is a call to this from gpu_info_collector_android before the GPU thread is launched. Change-Id: I6887ad1218b8426097f454741dc5a79ee94f9d62 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix an assertion in MediaCaptureDevicesDispatcherJocelyn Turcotte2014-05-071-0/+6
| | | | | Change-Id: I169f142e867ed1bda52dff7f5f66fb88ed802c01 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Windows: Fix yet another crash in ContantMainRunnerImpl::InitializePeter Varga2014-05-071-1/+5
| | | | | | | | Without initialization of the SandboxInfo it still crashes: g_broker_services is null. Change-Id: Ib4bc0666fefe0f81b489e0ef3c179eae866f804f Reviewed-by: Michael Bruning <michael.bruning@digia.com>