diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-06-12 13:09:13 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-06-12 14:22:30 +0000 |
| commit | 319fd4ea9ae89874671296c33880805c401844c9 (patch) | |
| tree | 35926f0a5c407ab9f02ce048ced19d5f24907a63 /src/winmain | |
| parent | efa9998521cb061051fe8b75d0df3206d0b32ec5 (diff) | |
Make WinMain linkage compatible with Qt 5
In Qt 5, the Qt5Core target was extended by Qt5CoreConfigExtras.cmake to
have a generator expression as interface linkage that would
conditionally link WinMain.
This patch implements the same through regular interface linkage right
in corelib. Since the linkage happens through a generator expression,
our dependency generator does not see this as a dependency. Therefore we
add this as an unconditional package dependency for corelib, on Windows.
In theory this could be done also in winmain's CMakeLists.txt, as
targets can be extended outside of their directory. However this adds a
directory id (WinMain:@<023423>) to the linkage, which mysteriously is
not removed on the exported core target.
Change-Id: If2abb9ba790f51274f582c9ec28c13d968b84302
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'src/winmain')
| -rw-r--r-- | src/winmain/CMakeLists.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/winmain/CMakeLists.txt b/src/winmain/CMakeLists.txt index 10c3252f43..1095a0e907 100644 --- a/src/winmain/CMakeLists.txt +++ b/src/winmain/CMakeLists.txt @@ -23,6 +23,4 @@ extend_target(WinMain CONDITION NOT WINRT extend_target(WinMain CONDITION MINGW DEFINES QT_NEEDS_QMAIN ) - -extend_target(Core LIBRARIES WinMain) # special case end |