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/core/api/core_api.pro | |
| parent | 83fa1d5f9b890ba251f7dc8f82acd950e9527343 (diff) | |
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/core/api/core_api.pro')
| -rw-r--r-- | src/core/api/core_api.pro | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/core/api/core_api.pro b/src/core/api/core_api.pro index 326d4481f..1c5f140e0 100644 --- a/src/core/api/core_api.pro +++ b/src/core/api/core_api.pro @@ -63,13 +63,6 @@ SOURCES = \ qwebengineurlscheme.cpp \ qwebengineurlschemehandler.cpp -### Qt6 Remove this workaround -unix:!isEmpty(QMAKE_LFLAGS_VERSION_SCRIPT):!static { - CONFIG -= warning_clean - SOURCES += qtbug-60565.cpp \ - qtbug-61521.cpp -} - msvc { # Create a list of object files that can be used as response file for the linker. # This is done to simulate -whole-archive on MSVC. |