diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-10 17:25:16 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-13 20:28:59 +0200 |
| commit | d91b839d67bcfa1cfeb3d095b6885c97c53b9812 (patch) | |
| tree | e4569500b0623856c77cf6f4ca591eb71fa3d49c /src/process | |
| parent | 83fa1d5f9b890ba251f7dc8f82acd950e9527343 (diff) | |
| download | qtwebengine-d91b839d67bcfa1cfeb3d095b6885c97c53b9812.tar.gz | |
Fix Qt6 build
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>
Diffstat (limited to 'src/process')
| -rw-r--r-- | src/process/process.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/process/process.pro b/src/process/process.pro index 0bdc9dd93..459eb9969 100644 --- a/src/process/process.pro +++ b/src/process/process.pro @@ -22,7 +22,7 @@ qtConfig(build_all): CONFIG += build_all qtConfig(framework) { # Deploy the QtWebEngineProcess app bundle into the QtWebEngineCore framework. - DESTDIR = $$MODULE_BASE_OUTDIR/lib/QtWebEngineCore.framework/Versions/5/Helpers + DESTDIR = $$MODULE_BASE_OUTDIR/lib/QtWebEngineCore.framework/Versions/$$QT_MAJOR_VERSION/Helpers } else { CONFIG -= app_bundle win32: DESTDIR = $$MODULE_BASE_OUTDIR/bin @@ -31,7 +31,7 @@ qtConfig(framework) { msvc: QMAKE_LFLAGS *= /LARGEADDRESSAWARE qtConfig(framework) { - target.path = $$[QT_INSTALL_LIBS]/QtWebEngineCore.framework/Versions/5/Helpers + target.path = $$[QT_INSTALL_LIBS]/QtWebEngineCore.framework/Versions/$$QT_MAJOR_VERSION/Helpers } else { target.path = $$[QT_INSTALL_LIBEXECS] } |