AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove win32_system_libs feature from src/corelib/configure.json

Browse Source 
This feature only existed to trigger the evaluation of the libs gdi32,
kernel32 and friends. Those libs only were relevant for the qmake build
of Qt and can be removed now.

Task-number: QTBUG-83932
Change-Id: Idfd4d8f70b6dbd1067412fecc1115b504b1ad347
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
This commit is contained in:
Joerg Bornemann 2021-02-25 15:46:32 +01:00
parent 800f745140
commit 00b75e86f3
3 changed files with 0 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/.prev_configure.cmake
View File

@ -892,10 +892,6 @@ qt_feature("forkfd_pidfd" PRIVATE
LABEL "CLONE_PIDFD support in forkfd"
CONDITION LINUX
)
qt_feature("win32_system_libs"
LABEL "Windows System Libraries"
CONDITION WIN32 AND libs.advapi32 AND libs.gdi32 AND libs.kernel32 AND libs.netapi32 AND libs.ole32 AND libs.shell32 AND libs.uuid AND libs.user32 AND libs.winmm AND libs.ws2_32 OR FIXME
)
qt_feature("cborstreamreader" PUBLIC
SECTION "Utilities"
LABEL "CBOR stream reading"

4
src/corelib/configure.cmake
View File

@ -898,10 +898,6 @@ qt_feature("forkfd_pidfd" PRIVATE
LABEL "CLONE_PIDFD support in forkfd"
CONDITION LINUX
)
qt_feature("win32_system_libs"
LABEL "Windows System Libraries"
CONDITION WIN32 AND libs.advapi32 AND libs.gdi32 AND libs.kernel32 AND libs.netapi32 AND libs.ole32 AND libs.shell32 AND libs.uuid AND libs.user32 AND libs.winmm AND libs.ws2_32 OR FIXME
)
qt_feature("cborstreamreader" PUBLIC
SECTION "Utilities"
LABEL "CBOR stream reading"

64
src/corelib/configure.json
View File

@ -185,66 +185,6 @@
"sources": [
"-lslog2"
]
},
"advapi32": {
"label": "advapi32",
"sources": [
"-ladvapi32"
]
},
"gdi32": {
"label": "gdi32",
"sources": [
"-lgdi32"
]
},
"kernel32": {
"label": "kernel32",
"sources": [
"-lkernel32"
]
},
"netapi32": {
"label": "netapi32",
"sources": [
"-lnetapi32"
]
},
"ole32": {
"label": "ole32",
"sources": [
"-lole32"
]
},
"shell32": {
"label": "shell32",
"sources": [
"-lshell32"
]
},
"uuid": {
"label": "uuid",
"sources": [
"-luuid"
]
},
"user32": {
"label": "user32",
"sources": [
"-luser32"
]
},
"winmm": {
"label": "winmm",
"sources": [
"-lwinmm"
]
},
"ws2_32": {
"label": "ws2_32",
"sources": [
"-lws2_32"
]
}
},
@ -1019,10 +959,6 @@
"condition": "config.linux",
"output": [ "privateFeature" ]
},
"win32_system_libs": {
"label": "Windows System Libraries",
"condition": "config.win32 && libs.advapi32 && libs.gdi32 && libs.kernel32 && libs.netapi32 && libs.ole32 && libs.shell32 && libs.uuid && libs.user32 && libs.winmm && libs.ws2_32"
},
"cborstreamreader": {
"label": "CBOR stream reading",
"purpose": "Provides support for reading the CBOR binary format.