summaryrefslogtreecommitdiffstats
path: root/src/core/content_main_delegate_qt.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.11' into 5.12Allan Sandfeld Jensen2018-10-221-0/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.json src/3rdparty src/core/content_browser_client_qt.cpp src/core/content_browser_client_qt.h src/core/login_delegate_qt.cpp src/core/login_delegate_qt.h src/core/net/url_request_context_getter_qt.cpp src/core/net/url_request_context_getter_qt.h src/core/qtwebengine.gni 3rdparty changes: 616a7f558c7e This is expected for us, so don't report it as an error. c30febceaa1b Do not write <protocol>.json to source directory 9e68e4f2d92c Remove incomplete logic to detect AMD K2 CPU's e0ed41c8e90a FIXUP: This is expected for us, so don't report it as an error. f9fd9109b4b7 Fix --single-process --disable-gpu combination not to hit asserts f305d65cc27e Reduce severity level of messages when kDisableGpu switch is used 5e3e5074bb78 Work around MSVC2017 optimizer bug when printing a page usind Pdfium 34f52ec3bae8 Bump maximum number of custom isolated world ids f7a2f8153c82 Fix hunspell::NodeReader::affix_id_for_leaf bounds check 1e80090f7044 Fix resolve_proxy service permissions 2e498629651d Add proxy_resolver_manifest Change-Id: I2b176c80aa315a0ae0a22b5707694fdcd407407b
| * Add proxy resolver serviceMichal Klocek2018-10-181-0/+6
| | | | | | | | | | | | | | | | | | This adds proxy resolver service as a part of content utility process and pulls in the corresponding change in Chromium. Fixes: QTBUG-69281 Change-Id: Icb2b67e1e506a5b511531322a8c13d7df0e11f9f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Adaptations for Chromium 68Allan Sandfeld Jensen2018-09-221-2/+3
| | | | | | | | | | | | Together-with: Tamas Zakor<ztamas@inf.u-szeged.hu> Change-Id: I805246b6f01cb151fff48588744408c676d87c14 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Add QWebEngineUrlScheme classJüri Valdmann2018-08-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Public API for the new url/url_util_qt extension to Chromium, which allows to integrate custom schemes into Chromium's url parsing library and security model. Previously custom schemes would be treated as 'unknown' schemes and rely on fallback behavior in Chromium. [ChangeLog][Custom Schemes] Added the QWebEngineUrlScheme class for configuring how custom schemes are parsed and which security restrictions should apply. Task-number: QTBUG-62536 Change-Id: I7d8b9da3ad742f568b82ccc6a2456ad35e84069b Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Migrate from BUILDFLAG to QT_CONFIGMichal Klocek2018-07-021-1/+1
|/ | | | | | | | | | | During configuration we mapped qt webengine fetures to chromium ones and passed them to gn. We used BUILDFLAG to optionally compile code in core. Use QT_CONFIG directly for qt files and add config sanity checks to make sure requested features are present. Change-Id: I930df114ac9aec8e73139ea9135925fc3ad8e39c Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Fix localization of descriptions in directory listing pagesJoerg Bornemann2017-10-051-2/+32
| | | | | | | | | We never replaced the variable values in the HTML template for directory listings. Task-number: QTBUG-63377 Change-Id: I5cd3d44ef253f6ed2e18f7e0cd4324c000c31dde Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add LICENSE.ChromiumKai Koehne2017-09-201-1/+1
| | | | | | | | | The mentioned LICENSE file is not available; add it under the name LICENSE.Chromium. Task-number: QTBUG-60006 Change-Id: Ib2b3cb64467046c7ba1f53b0bbe14c3ec5a5291d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix crash with --no-zygote on LinuxPeter Varga2017-06-281-4/+9
| | | | | | | | | | | | | | | | Zygote process is responsible for initializing ResourceBundle on Linux. Thus it is expected to be initialized in Renderer process. When zygote is disabled the Renderer process can't reload locale resources since the ResourceBundle hasn't been initialized yet. However, there is no need for reload because without zygote, Renderer Process initializes ResourceBundle for itself. Pulls in Chromium changes: 5352138 [Backport] Initialize RenderSandboxHostLinux in --no-zygote mode to not crash. Change-Id: Iace3585e23b4f18850783a813b1466a3ff5fe12f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix spellcheck feature checkAllan Sandfeld Jensen2017-04-041-1/+1
| | | | | | | | | Was changed to generated buildflag headers instead of command line defines. Task-number: QTBUG-59687 Change-Id: Iead64f5321d000c07172ee27a0032394527ec501 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Allan Sandfeld Jensen2017-02-081-4/+18
|\ | | | | | | Change-Id: I0c3654ad097809fe10bcc6a15827a0af3006c4e6
| * Do not create directories for overridden pathsJoerg Bornemann2017-02-071-4/+18
| | | | | | | | | | | | | | | | | | When overriding Chromium's default paths do not create non-existent directories anymore. Just print a diagnostic message. Task-number: QTBUG-54258 Change-Id: Ie642a630ad5b4aebc4e80e3eace7db7489a82907 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Fix grit/net_resources.h includeMichal Klocek2016-12-081-1/+1
|/ | | | | Change-Id: Ibe2e622c4c4a16b4e572af7057ec9ba23a98bb8a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-051-1/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also blacklist tst_QWebEnginePage::comboBoxPopupPositionAfterChildMove() and comboBoxPopupPositionAfterMove(). Conflicts: .qmake.conf src/3rdparty src/core/render_widget_host_view_qt.cpp src/core/resources/resources.gyp src/webengine/doc/src/qtwebengine-platform-notes.qdoc src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h tests/auto/widgets/qwebenginepage/BLACKLIST tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp tools/qmake/mkspecs/features/functions.prf Task-number: QTBUG-55158 Change-Id: I1d73ac9b3ca5293ad3c7e3a56f4c395da930e6f4
| * Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-08-021-1/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/resources/resources.gyp src/webengine/doc/src/qtwebengine-overview.qdoc src/webenginewidgets/api/qwebenginepage.cpp src/webenginewidgets/api/qwebenginescriptcollection.cpp src/webenginewidgets/api/qwebenginescriptcollection_p.h tests/auto/widgets/qwebenginepage/BLACKLIST And readded newly in 5.6 enabled tests to the BLACKLIST. Change-Id: I4ab1fc54ebfaaf940df81b0d8d6bdd15cae8b7c4
| | * Remove handling of DIR_MEDIA_LIBSAllan Sandfeld Jensen2016-06-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DIR_MEDIA_LIBS was where ffmpegsumo was before 5.6 which removed it. When we don't have the library it used to be in, we return the fallback path, which by OverridePath will be created if it doesn't exits. DIR_MEDIA_LIBS is not used anywhere by Chromium anymore, so remove the code. Task-number: QTBUG-54258 Change-Id: I1015bd3549c617916c06b633ba3e483ef855ff84 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | Fix changing locale of ResourceBundle on LinuxPeter Varga2016-07-131-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ResourceBundle is not re-initialized for new Renderer Processes because it is initialized only once in Zygote Process. This means runtime locale changes do not affect new Renderer Processes. Zygote Process is supported on Linux only thus other platforms don't need this fix. With this change the locale of the ResourceBundle is reloaded when new Renderer Process is started. For accessing the pak file of the locale in the sandboxed environment the file descriptor is passed via the Chromium's GlobalDescriptor solution. Task-number: QTBUG-53000 Change-Id: I57e84078db9d0795d16d930aa1b3e93a6e86ec39 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Output VLOG messages with process and thread IDsDongmei Wang2016-06-221-0/+6
|/ / | | | | | | | | | | | | | | | | | | By default, process and thread IDs are not outputted in VLOG messages. Enable outputting process and thread IDs in VLOG messages, which makes it easier to debug in multi-process and multi-threaded environments. Change-Id: I5ca4c418d65d709908f20fc7dce1c3490c6e0a93 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Cleanup copyright and origin in src/coreAllan Sandfeld Jensen2016-04-291-0/+5
| | | | | | | | | | | | | | | | Adds copyright and origins to files in src/core based on Chrome sources. Change-Id: I842ce4c170bfeabe06d92fb67fef3d8f9a202ddc Task-number: QTBUG-53048 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Parse logging verbosity levelsAllan Sandfeld Jensen2016-04-211-10/+30
| | | | | | | | | | | | | | | | Call logging::InitLogging so arguments such as --v and --vmodule are parsed and used to configure chromium logging levels. Change-Id: I44f8ed6b0ca9db4d606ced383c269566218383ad Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-211-0/+10
|\| | | | | | | | | | | | | | | Conflicts: src/3rdparty src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc Change-Id: I90728e965399e51b626d538924de955f9abab5fe
| * Initialize lazy base::CPU when IO are allowedIlia Kirianovskii2016-03-101-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should initialize base::CPU to get it a chance to read /proc/cpuinfo when IO operations are allowed. So it prevents the following error on ARM platform: ``` [0204/071425:FATAL:thread_restrictions.cc(38)] Function marked as IO-only was called from a thread that disallows IO! If this thread really should be allowed to make IO calls, adjust the call to base::ThreadRestrictions::SetIOAllowed() in this thread's startup. ``` In the same manner it is done in ChromeMainDelegate::PreSandboxStartup. Change-Id: I1facd9d856a8dbfdf03ddbb1ab8d76d2efe69050 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-03-081-0/+7
|\| | | | | | | Change-Id: Ieab3c4a6d16b1d7b7c0243ff8898f81807e7b1fc
| * ICU: Do not try to search for icudtl.dat for WEBENGINE_CONFIG+=system_icuKai Koehne2016-03-011-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not try to find icudt.dat if we use system ICU. This avoids warnings like Qt WebEngine ICU data not found at /usr/share/qt5/resources. Trying parent directory... Qt WebEngine ICU data not found at /usr/share/qt5. Trying application directory... Qt WebEngine ICU data not found at /bin. Trying fallback directory... The application MAY NOT work. on every startup, e.g. for embedded linux. The defines and macros are the same as in chromium. Task-number: QTBUG-51156 Change-Id: I6c24b73cca88020504489695e889f49c5d7be424 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Add spell checker supportMichal Klocek2016-02-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrate chromium spell checker: * add spellchecker and dependencies to build * underline misspelled words in html text areas * right-click context menu shows up to 4 options to correct the misspelled word * toggle spell check from context menu * add new qml and widget api calls to qwebengineprofile to enable/disable spell check, select spell check language, get list of supported languages/dictionaries * register new qml spell check properties for QtWebEngine 1.3 * CONFIG+="no_spellcheck" to remove spellcheck support Change-Id: Ie61434ab9493597d7759a6f33794f6859c4e3a4c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Unify license header usage.Jani Heikkinen2016-02-011-11/+14
|/ | | | | | | | | Update files using old header.LGPL3 to use header.LGPL Update files using old header.FLD to use new header.FDL Update files using old header.BSD to use new header.BSD Change-Id: I36a67aaa8c3ca6c7946308defc9c03c3571a7d23 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Trivial changes for Chromium 44Allan Sandfeld Jensen2015-06-231-1/+1
| | | | | Change-Id: I8261b201f1d6623eff3427b68b8d098c17d293d3 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Force to use English language for QML auto testsPeter Varga2015-04-231-1/+1
| | | | | | | | | | Moreover, localization setting via QtWebEngine is fixed. System localization setting can be overridden by --lang command line argument. Task-number: QTBUG-45715 Change-Id: I39f3a891e55ee47a57afc394e849ea02b0c76ad5 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Revert "Enable the use of IPC tracing"Peter Varga2015-04-071-6/+0
| | | | | | | | | This reverts commit 3ef408a32c352d86fbc1346304e0a6ffbbe12c0b. Change causes assertions in debug when browser exits. Change-Id: I5e4a57d4e444ad2974c7fe44c4928c486337a04a Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Enable the use of IPC tracingPierre Rossi2015-03-191-0/+6
| | | | | | | | | | This can be used with debug builds, or by passing DEFINES+=IPC_MESSAGE_LOG_ENABLED at qmake time. IPC message logging is then controlled by the CHROME_IPC_LOGGING environment variable (e.g. CHROME_IPC_LOGGING=color). Change-Id: I0e423e716582f339cd4a30bf99e284bdefe00313 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Add namespace to internal QtWebEngine APIAllan Sandfeld Jensen2015-03-021-0/+3
| | | | | | | | 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>
* 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>
* Update Chromium to version 40.0.2214.28 and ninja to 1.5.3.Zeno Albisser2015-01-201-1/+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>
* Make Chromium use the same locale as QtAllan Sandfeld Jensen2015-01-131-1/+3
| | | | | | | Tell Chromium to use the locale Qt has determined as the default locale. Change-Id: I16986d84afcc0b496a22441b4a92fc09a5c89121 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Add --log-level switchPeter Varga2014-09-111-0/+17
| | | | | | | | | | | | | | | | | The --log-level switch sets the log level of the chromium messages. It affects the browser and web processes but has no impact on the Qt messages. The following levels can be set: 0 -> LOG_INFO 1 -> LOG_WARNING 2 -> LOG_ERROR 3 -> LOG_FATAL Log level 3 set per default (fatal messages are shown only) since lower level messages might be irrelevant for those who use QtWebEngine API. Change-Id: Ie2ba10718d3c86bbfe3d847471b3facb346be446 Reviewed-by: Andras Becsi <andras.becsi@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-4/+5
| | | | | | | | | | | | | | | 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>
* Fix path service assertionsAndras Becsi2014-02-131-2/+3
| | | | | | | | | | | | | Registering a path provider did not turn out to be a clean enough solution for overriding chromium paths because of debug assertions that require the key range not to collide with already registered path providers. Instead of patching chromium or using workarounds switch back to using PathService::Override and only replace the jni-based default PathProviderAndroid on embedded android. Change-Id: I4530bc8fa3eba36c0d2403729be9a792f3c2120f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Register a path provider for Qt instead of using PathService::OverrideAndras Becsi2014-02-061-3/+2
| | | | | Change-Id: I465a5465ec4189b077a8c1cbab7485c628eca899 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix html5 videoAndras Becsi2014-01-221-0/+2
| | | | | | | | | | Deploy the built ffmpegsumo library and make chromium find it by overriding the content::DIR_MEDIA_LIBS path with the deploy location. We deploy the plugin to $$[QT_INSTALL_PLUGINS]/qtwebengine. Change-Id: I0aeb37fccd2af62b23f8e6405041655e1f66b7aa Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Add a stub message system to communicate with the blink WebViewJocelyn Turcotte2014-01-221-0/+6
| | | | | | | | | | | | | | | | | This follows the model used by the Android WebView's AwRenderViewExt class. QtRenderViewObserverHost is attached to the WebContents and QtRenderViewObserver is attached to the RenderView in the render process. Both can exchange messages together and allow async commands to be carried from WebContentsAdapter and the result sent back through WebContentsAdapterClient. This patch also adds a renderer subdirectory to start matching the directory structure of Chromium. Change-Id: I724ca2fe2a597dcd2a15e8e1a23c4eeba1190703 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Add ftp protocol handler.Xiao Zhang2013-12-101-0/+11
| | | | | Change-Id: Ib5ec11a23d609414f609969dbb2933d83eb6e3bd Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Introduce WebEngineLibraryInfo for providing pathsArvid Nilsson2013-12-091-29/+3
| | | | | | | | | This allows us to customize paths on BlackBerry, where QtWebEngine is currently installed to an different location than the rest of Qt5. Change-Id: I7144c992bed9fe4d7543ce0d23ee8cd5f5669dd9 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Use the process we install to libexecPierre Rossi2013-12-031-9/+12
| | | | | | | | | Via QLibraryInfo. Also pick the name from qmake, and drop the hardcoded value. Add better error reporting when this fails. Change-Id: I44891a16f079b6c3c334f7f2bafa9edc0b4d69e4 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Use ContentMainDelegateQt also for child processesPierre Rossi2013-12-031-0/+94
This will be necessary in order for the render process to load localized strings among other things. Change-Id: Ibb75e49f0bc583c158af61817e5b350f3534ec16 Reviewed-by: Andras Becsi <andras.becsi@digia.com>