summaryrefslogtreecommitdiffstats
path: root/src/process
Commit message (Collapse)AuthorAgeFilesLines
* Fix setup for 'no-prefix' buildsMichal Klocek2021-10-281-4/+13
| | | | | | | | | | | | | | | | | | | QT_SUPERBUILD is never cached and user can run only qtbase as super build and compile any other module as separate module build, moreover this can be also 'no prefix' build. Fix missing checks to support that case and clean up install of resources. For mac framework builds copy bundle to right place in case of 'no-prefix' builds. Fixes: QTBUG-94604 Task-number: QTBUG-96375 Pick-to: 6.2 Change-Id: I4ab7d4fed2c2be93f2a048a510419849361883ba Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Remove the rest of qmake based configurationMichal Klocek2021-10-141-78/+0
| | | | | | | | | | The only not cover part in cmake port are: * ios builds for qtpdf * qt static dependecies for qpdf Pick-to: 6.2 Change-Id: Iefe624c35d847b4a9c3cd970192487340b1657f9 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Add easy way to check if webengine process worksMichal Klocek2021-10-141-1/+7
| | | | | | | | If called without args print versions. Pick-to: 6.2 Change-Id: Id34179a099e9d53111a6638f0cddadcb401e61e5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Apply separate_debug_info to QtWebEngineProcessAllan Sandfeld Jensen2021-09-231-5/+3
| | | | | | | | Was missing the calls to the qt cmake standard methods for that. Pick-to: 6.2 Change-Id: I47507c6fa89b7f3e66fe4eb7526f6fb6074f2293 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix rpaths on mac framework buildsMichal Klocek2021-09-181-3/+6
| | | | | | | | | | | | | | | | | | In case of framework builds webengine process needs LC_RPATH with @loader_path or @executable_path which resolves to the absolute path of the webengine process executable so correct value is @loader_path/../../../../../../../ Do not try to resolve relative path in qtbase because for some reason it can give different result on different build setups use fixed INSTALL_RPATH property. Fixes: QTBUG-96539 Change-Id: I6e8f8c15ac40c261a4f5e3c6b9ed8b4c168a38ec Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 310db2b8164fd2a8d9bed4bbf46faa674ff553cc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix manifest and plist for render processMichal Klocek2021-09-042-22/+7
| | | | | | | | | | | | | | | | Add manifest file in case of windows build. Manifest verified with mt tool on windows: mt -inputresource:QtWebEngineProcess.exe -out:process.manifest For plist we use template MacOSXBundleInfo.plist.in and only CFBundleIdentifier was missing compared to our custom plist file. Pick-to: 6.2 Change-Id: Iafcc0d456ec43c6465eacd9a4719a388bf421f7c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix indentationAllan Sandfeld Jensen2021-08-311-17/+17
| | | | | | Pick-to: 6.2 Change-Id: I70375cabda3282e9dc1aa1a8e0513522abbcd383 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Set right RUNPATH for QtWebEngineProcessAllan Sandfeld Jensen2021-08-301-3/+5
| | | | | | | | | Call qt_apply_rpath like for Qt tools or apps. Pick-to: 6.2 Fixes: QTBUG-96093 Change-Id: I22c670ede70ba52d1255bb362519d152a227f5f3 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Rewrite gn-cmake integrationMichal Klocek2021-08-291-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous gn-cmake integration was driven towards having the complete cmake build tree which included gn build artifacts. These were marked as IMPORTED in cmake build files, this way cmake "knew" all object files and static libs coming from gn. To achieve that we needed to run the cmake configure twice. First to feed gn with the build information from cmake and then the second run to import all the build information to cmake based on gn run. As a side effect of this the first run cmake was creating incomplete targets, so we could use generator expressions to gather all the data needed for gn run. The second run of cmake was able to create fully initialized targets. We used 'external project' to run cmake the second time. This approach worked well when doing "module" builds and having two targets, one in the main project and one in external was not an issue. Moreover, this approach could be integrated nicely since CI does only "module" builds. Unfortunately "top level" builds are implemented to import all qt targets into one build tree. This created issue for qtwebengine since fully initialized targets were 'hidden' by 'external project' and including half baked (dummy) targets from the main project resulted in bunch of issues related to the dependency tracking and build race conditions. Also using 'external project' complicated installation rules and in the end installation worked differently than in other modules. With current approach we use response files, so we hide all build artifacts coming from gn and feed cmake with those response files. This way we run the cmake configure once and we create all the targets once. Using rsp files hacks linker options in cmake, so this approach is sub-optimal, however allows to have working "top level" builds. It is worth mentioning here that the final module linking has to take place with cmake's part of build since doing one static lib in gn is not possible due to the toolchain limitation (msvc is not able to process static libs over 4Gb and has no support for thin archives, so only a shared lib is doable at time of writing) Following changes are made: * remove 'external project' for qtwebengine target, we keep it however for ninja ,gn and a host project * call gn from cmake in a scripting mode during build and not configure run, this way BUILD.gn is assembled as a build step so after generator expressions are executed * BUILD.gn is assembled now from 4 files: - root template BUILD.root.gn.in - compiler data gn_config_c.cmake, gn_config_cxx.cmake - sources data gn_cofnig_target.cmake * since we use gn wrapper script use gn.args file to pass arguments instead of a command line, so this file can be now easily modified when running gn and ninja 'manually' * since a script mode does not support handling of properties with TARGET as such, use the DIRECTORY scope in some of our functions which handle GN_TARGET * use qt_build_repo() in main CMakeFile and remove all coin and top level build hacks * remove 'external project' for examples and tests, this is no longer required as all qt targets are not hidden by external project * remove leftovers from gn feedback call used for GN_TARGET * improve installation rules, WebEgineCore target is not by default installed during build, therefore we need to copy resources and translations to root so tests and examples still can be built without a module being installed first * adjust GN lookup paths, we look for gn in main configure and during scripting mode when gn is executed Fixes: QTBUG-94349 Fixes: QTBUG-94709 Fixes: QTBUG-94922 Fixes: QTBUG-94997 Fixes: QTBUG-95051 Fixes: QTBUG-95152 Fixes: QTBUG-95158 Fixes: QTBUG-95972 Task-number: QTBUG-95231 Task-number: QTBUG-95590 Pick-to: 6.2 Change-Id: I5e7a34287ee59d904103fe310fc7c6a36a8dfbc9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add 'amazing' windows linker workaround for rsp filesMichal Klocek2021-08-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This should be part of previous patch, however it deserved separate commit message with explanation. On windows cmake generates ninja rules with cmake wrapper for linker in form of: cmake.exe -E vs_link_dll vs_link_dll internal command unfortunately expands all rsp files passed to liker before calling it (it looks for '@') and also swaps the order. This ends in bogus linker call. Make a workaround based on: https://github.com/Kitware/CMake/blob/master/Source/cmcmd.cxx#L2102 Use response files prefixed with 'CMakeFiles' so internal command of cmake will skip the processing. Since rsp files must now start with filename and not with filepath we also need to copy them to directory where we call the linker. Task-number: QTBUG-95590 Pick-to: 6.2 Change-Id: I8e96ebf3a9ac7c7d751db6682ce37f38880be793 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Suppress console window for subprocess on windowsKirill Burtsev2021-08-061-0/+1
| | | | | | | Fixes: QTBUG-95571 Pick-to: 6.2 Change-Id: If1a14f5cd5b9428e4c6265c5464b071fd8320562 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
* QtWebEngineProcess: fix installationLi Xinwei2021-07-291-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 09e5da6ac44c01ae0de34b789c42da515e82f07c, we pass "NO_INSTALL" to qt_internal_add_executable(), so we have to handle some installation issues manually. Use qt_get_cmake_configurations() instead of get_install_config(). Because get_install_config() only returns the first config in a multi-config build, this causes the debug executable not installed. We can install the debug executable to ${INSTALL_LIBEXECDIR}/Debug, like other executables, to avoid conflict with the release executable. But this will make installation codes very complex. So I propose to restore Qt5's behavior for it , add a "d" suffix to the debug executable and install both executables to ${INSTALL_LIBEXECDIR}. This can also avoid breaking windeployqt's logic of finding the debug executable of QtWebEngineProcess. Also adjust the output directory property to place executables under the correct directory. The release executable should be placed under ${QT_BUILD_DIR}/bin rather than ${QT_BUILD_DIR}/bin/Release. Given that the debug executable now has a "d" suffix, it can also be placed under the same directory. And install PDB files manually because QtWebEngineProcessd.pdb should be installed to ${INSTALL_LIBEXECDIR}, but qt_internal_install_pdb_files() will install it to ${INSTALL_LIBEXECDIR}/Debug. Pick-to: 6.2 Change-Id: I38b5e8d9ed939b88de86ab5722dd56777442ed03 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Do not install QtWebEngineProcess twiceKai Köhne2021-07-161-1/+4
| | | | | | | | | | | Pass NO_INSTALL, so that QtWebEngineProcess is not installed into INSTALL_BINDIR. We have explicit install rules further down below. Pick-to: 6.2 Fixes: QTBUG-95153 Change-Id: I2dfae1e8a6bb9183d25590b7ba5cdb136252a1e4 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Add windows to the cmake buildMichal Klocek2021-05-224-52/+11
| | | | | | | | Fix cmake for windows builds and add QtWebEngineSandbox target. Task-number: QTBUG-91760 Change-Id: If962a81ddfb509d104ad8ffbfbf34f1150ae82ce Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add mac builds to cmakeMichal Klocek2021-05-221-4/+23
| | | | | | | | | | | We need to pass -F or -iframework to gn as a compiler flag, however cmake keeps this parameter as include dir and adds internally "-iframework QtFoo.framework/.." for the compiler call. This internal handling can not be accessed with the genex. Add the manual conversion. Task-number: QTBUG-91760 Change-Id: Id12831432ccb0516be52f79bd5f6cfcbe7e87d9c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Refactor and create gn targetMichal Klocek2021-05-221-1/+10
| | | | | | | | | | | | | | | | | Refactor the gn handling and add: * the gn target for encapsulating resources needed to run chromium builds * the support for SOURCES, INCLUDES, DEFINES, COMPILE OPTIONS. * the multi config support for cmake and enable debug, release builds * CONDITION evaluation for the gn target and the gn arg list * the linux specific config and all missing source sets * use REALPATH instead of ABSOLUTE, this fixes missing drive letter on windows Task-number: QTBUG-91760 Change-Id: Ib283d8ab817ff36ee9c94c2b8f44785709c45258 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add QtWebEngineCore module cmake buildMichal Klocek2021-05-191-0/+20
| | | | | | | | | | | | | | | | | | | | | Create QtWebEngineCore, QtWebEngineProcess and drive headers sync from the libs project. Main project build should not generate any header files, since the logic in qtbase assumes fixed QT_BUILD_DIR, which is by default CMAKE_BINARY_DIR for prefix builds. Drive all syncqt calls from the libs project and leave the main build just for the feature evolution and the build summary reporting. This fixes header installation issues, however this patch requires also sync.profile update which is done later, to keep the qmake build still functional. Note this patch only adds debug builds for linux. Task-number: QTBUG-91760 Change-Id: I516c26206baa1cf6b966629a694dadce7f79dbec Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2021-01-251-0/+1
|\ | | | | | | | | | | Including update to 87-based Change-Id: I36b6054e00de97ab055d0bc800cff08d0408fac6
| * Adaptations for Chromium 87Allan Sandfeld Jensen2021-01-131-0/+1
| | | | | | | | | | Change-Id: Ic4ffd98e02f986dbaf986405360e727c813e696e Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| * Use the module's version number for QtWebEngineProcessNils Jeisecke2020-11-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | When built against a Qt version different from the module version, all QtWebEngine libraries will be versioned with MODULE_VERSION. QtWebEngineProcess as part of the module should be handled in the same way. Change-Id: I34073337e813baac46f207443bf54ca78d879ea6 Reviewed-by: Andy Shaw <andy.shaw@qt.io> (cherry picked from commit c636e88bc49f59548e1ac3401ae547e2ae9d2570) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Revert "Fix QtWebEngineProcess.exe build on windows to include version ↵Nils Jeisecke2020-11-061-3/+0
| | | | | | | | | | | | | | | | | | | | | | resources" This reverts commit ed8fe2b34712e70becaae29520afdc8e56addf35. Reason for revert: Change in 5.15.2 is already done in e33a7a7592ed8517ec83543d822178871f25b0c5 Change-Id: I3d866f6fafbe22ebf9552497d19ebd5fd17e1bf0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Fix QtWebEngineProcess.exe build on windows to include version resourcesNils Jeisecke2020-11-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 5.12.x build the .exe version resources are still present. The version meta data is important for MSI based installers. Without this information an uprade for a Qt 5.12 based application to 5.15 will most likely fail. Also the version information contains copyright information of the Qt Company. [ChangeLog][QtWebEngineProcess] Fix missing version resources in QtWebEngineProcess.exe. Fixes: QTBUG-88110 Change-Id: I965da2db78dbf74ff93e1975c0622edc7c404bc2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Add a version number for the QtWebEngineProcess executableAndy Shaw2020-09-161-0/+3
| | | | | | | | | | | | | | Change-Id: I81111633fb0050f75e49c8bee0354436ecec533a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 17cab42bf68ee70f641718a144f864eb04042aa4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Use the module's version number for QtWebEngineProcessNils Jeisecke2020-11-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | When built against a Qt version different from the module version, all QtWebEngine libraries will be versioned with MODULE_VERSION. QtWebEngineProcess as part of the module should be handled in the same way. Change-Id: I34073337e813baac46f207443bf54ca78d879ea6 Pick-to: 5.15 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Update dependencies on 'dev' in qt/qtwebengineAllan Sandfeld Jensen2020-11-021-2/+2
| | | | | | | | | | Change-Id: I74c7293ebf5ace5bd07e3bf5455dd90bf4ed6380 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Add a version number for the QtWebEngineProcess executableAndy Shaw2020-09-151-0/+3
| | | | | | | | | | | | Pick-to: 5.15 Change-Id: I81111633fb0050f75e49c8bee0354436ecec533a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devMichael Brüning2020-07-281-1/+1
|\| | | | | | | Change-Id: Ie9970a657f7693c190405039c9b713e24dbd4041
| * Do not evaluate NINJA_TARGETDEPSMichal Klocek2020-07-271-1/+1
| | | | | | | | | | | | | | It is just a file path. Fixes qmake linking when chromium changes. Change-Id: Ib2f0976a6dc3c90c415b69e1876706bc2397d134 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2020-03-174-4/+105
|\| | | | | | | | | | | | | | | | | | | | | Blacklists tst_Accessibility::focusChild() for now. Conflicts: src/core/api/core_api.pro src/core/net/plugin_response_interceptor_url_loader_throttle.h src/process/process.pro Change-Id: I95821a3851120dc16673f4c760e802952eae5c41
| * Fix separate-debug-info build of QtWebEngineProcessAllan Sandfeld Jensen2020-03-071-1/+11
| | | | | | | | | | | | | | | | | | Since recent change in qtbase, debug-info is also separated from executables, unfortunately it had the wrong path due to how qt_app is written so we need to inline it. Change-Id: Ia0a5364ed5ac7169aa32bb4c1dab746457f1be6c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * [macOS] Install entitlements file for QtWebEngineProcess.appMichael Brüning2020-01-272-0/+5
| | | | | | | | | | | | | | | | | | This is needed so macdeployqt can find the entitlements file and enable us to sign the QtWebEngineProcess binary for the entitlements it needs with the hardened runtime. Change-Id: I0c1811af84aa4b8ae3f30129909f092dff0f816f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Fix youtube with Qt ltcg buildsAllan Sandfeld Jensen2020-01-131-0/+2
| | | | | | | | | | | | | | | | The exported symbols in the helper process does not work when ltcg is enabled, and we already disable the same for qtwebengine core. Change-Id: Ia0b662bb64f368e77bdfcdc02e6f853525dda0b3 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * Enable Windows sandboxAllan Sandfeld Jensen2019-12-193-3/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable sandboxing on Windows. Enable heterogeneous sandbox symbol resolution and statically link the sandboxing code into the helper process. This means we have two copies of the sandboxing code, one statically linked in the executable and one in the shared library. Since they are not exported they don't conflict, but we need to take to initialize the right version in the helper process binary, and pass its sandbox interface to shared library using it. For sandbox debug output, we also need to initialize the second copy of the commandlineparser and logging system. Fixes: QTBUG-51170 Change-Id: I8f503c8d6b40674465f32772ef906817dad2b449 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
| * Add entitlements to QtWebEngineProcess.appMichael Brüning2019-12-171-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds entitlements needed by the QtWebEngineProcess.app bundle when running with the hardened runtime. To use these entitlements when deploying an application with the hardened runtime enabled or notarizing it. To use it, deploy and sign the application using macdeployqt, then re-sign it using the additional entitlements that are contained in this patch. Coming version of macdeployqt may do this automatically when the hardened runtime is enabled. Task-number: QTBUG-77442 Change-Id: I7fde358725cf2d490f5e644934bf6466c2b4e1cb Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into wip/qt6Liang Qi2019-09-121-1/+2
|\| | | | | | | Change-Id: Ida28f81014758a4b164a7ddc958b3ba5afc74c79
| * Remove usages of deprecated APIsSona Kurazyan2019-09-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Replaced the following deprecated APIs: QWebEngineProfile::setRequestInterceptor -> QWebEngineProfile::setUrlRequestInterceptor QWebEngineSettings::globalSettings -> WebEngineSettings::defaultSettings QLayout::setMargin -> QLayout::setContentsMargins QWheelEvent::{x, y} -> QWheelEvent::position QWheelEvent::{globalX, globalY} -> QWheelEvent::globalPosition QSysInfo::windowsVersion -> QOperatingSystemVersion::current Qt::InputMethodQuery::ImMicroFocus -> Qt::InputMethodQuery::ImCursorRectangle QDesktopWidget::screenGeometry -> QGuiApplication::primaryScreen::geometry QTime -> QElapsedTimer - Fixed the tests to compile when deprecated APIs are disabled. - Replaced the doc references to deprecated APIs with the new ones. Made the docs for deprecated APIs compile conditionally, based on deprecation version. Task-number: QTBUG-76491 Change-Id: I5c6b7c628957deb9163f0bd2b6bc31bde1c7daec Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Fix Qt6 buildAlexandru Croitor2019-08-131-2/+2
|/ | | | | | | | | | | | Fix Qt 6 incompatible source usages. Also bump version. Also make sure in a framework build, the process executable is placed under the correct major version directory. Also remove the ABI compatibility fixes that we did for malloc symbols and friends. Change-Id: Ie26f660502a20afd2a79334c9b4f07d9a14a1ed3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Adaptations for Chromium 66Allan Sandfeld Jensen2018-06-261-7/+7
| | | | | Change-Id: Iee88721a50036d4ef85a23dd1708d4fb84218708 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Update export symbols for webenginecore moduleMichal Klocek2018-06-151-1/+1
| | | | | | | | | | | Use own WEBENGINECORE_EXPORT define, mark most headers private and use WEBENGINECORE_PRIVATE_EXPORT for it. For sanity, add "WARNING" as for private headers even though they are never installed. Change-Id: I523d28c1d00217f48bc63dabf138dd3a7eb482d4 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Separate argv for QCoreApplication and Chromium in WebEngineProcessKai Koehne2018-02-211-3/+25
| | | | | | | | | | | | | | | | On Linux, Chromium manipulates argv, merging all command line arguments into argv[0] and deleting the other arguments - see set_process_title_linux.cc for the glory details. This potentially confuses QCoreApplication::applicationDirPath(), which assumes that argv[0] contains the binary path. This in turn caused a regression in Qt 5.9.4 where resource files could not be located anymore for QtWebEngineProcess. Avoid this by making two distinct copies of argv already in main(). Task-number: QTBUG-66346 Change-Id: I24d103bb15e77db69faae3bcfc736df25e4ec5d3 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Mark QtWebEngineProcess as compatible with Windows 10Kai Koehne2017-04-212-0/+19
| | | | | | | | | | | | | | This fixes ::GetVersionEx to report the actual Windows version, instead of always reporting Windows 8. Note though that this fixes only the renderer process - the manifest of the user process is beyond our control. Chromium currently uses the dynamic checks for Windows 10 to e.g. enable advanced sandboxing for ppapi, and scroll performance (see https://bugs.chromium.org/p/chromium/issues/detail?id=517183) Change-Id: I72870f31eac2074748b2c11a2b6cab9a03e62527 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Allan Sandfeld Jensen2016-08-301-63/+1
|\ | | | | | | Change-Id: I82f7a6a6d1bf27dc8adf7e2a91ea8ab29c54a607
| * Fix sandboxing of localtime syscallAllan Sandfeld Jensen2016-08-191-63/+1
| | | | | | | | | | | | | | | | | | | | The check OS(LINUX) does not work here, so use the Qt OS defines, and remove the stat and fopen overrides that Chromium no longer proxies this way. Task-number: QTBUG-55125 Change-Id: Ie03b8e0cabd100f2f72b7ab1cff5dc8697ba69ad Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Adjust webengine to the qtConfig() changes in qtbaseLars Knoll2016-08-231-3/+3
|/ | | | | Change-Id: I907f6ea73a1d707eda536764c4b0b2edea49a963 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix debug-only build on WindowsJoerg Bornemann2016-05-091-1/+1
| | | | | | | | | | Do not attempt to build the release version of QtWebEngineProcess if Qt is not configured for release. Task-number: QTBUG-53240 Change-Id: Iff52a5049b3eefdd52c405fb80095a4d53c55fba Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* Provide a debug version of QtWebEngineProcessJoerg Bornemann2016-05-041-0/+2
| | | | | | | | | | | | | We never shipped a debug version of the QtWebEngineProcess executable. This is problematic in debug_and_release builds when a debug application starts the release version of QtWebEngineProcess. The Qt libraries will then be loaded twice, in debug and release. Also, in development setups where only the debug libraries are deployed, the release version of QtWebEngineProcess cannot be loaded. Task-number: QTBUG-49493 Change-Id: I2f7bfb9c7cf8e869dc91007f4e967a713f438065 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Merge branch '5.6' into 5.7Allan Sandfeld Jensen2016-04-112-20/+15
|\ | | | | | | Change-Id: I53645ee5405b1c43807123fd3c196e314cfd1ce9
| * Use qt_app -> relative_qt_rpath for QtWebEngineProcess.Alexandru Croitor2016-03-241-15/+12
| | | | | | | | | | | | | | | | | | | | Use CONFIG+=relative_qt_rpath to make sure the web engine process contains a relative rpath instead of an absolute path rpath value. Change-Id: I5f3c9fb93273c41bed795aeba112f260382d2bf8 Task-number: QTBUG-50155 Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * Stop using QT_PRIVATE for QtWebEngineProcess in a non-framework build.Alexandru Croitor2016-03-241-4/+2
| | | | | | | | | | | | | | For executables, QT and QT_PRIVATE are the same. Change-Id: I8f8ef29aea6f4ebb3d7b6cd2f3bc6a3cbf83b0e4 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Set CFBundleIdentifier for QtWebEngineProcess to a proper value.Alexandru Croitor2016-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | When QtWebEngineProcess bundle is created, the generated Info.plist CFBundleIdentifier contains the default dummy prefix added by qmake, namely: "com.yourcompany.QtWebEngineProcess". Make sure it uses the proper "org.qt-project.Qt" prefix. Change-Id: I8e060aeeeb8a53980139e790d3e3947752ffa1d3 Task-number: QTBUG-51942 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 03:45:41 +0000