1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lowercase system includes and lib names for Windows, fix cross compiling

Browse Source 
When cross compiling from a case sensitive file system, casing
matters, and mingw headers and import libraries consistently
use lowercase.

This was uncovered by d385158d5213ef568b7629e2aa4a818016bbffac;
prior to that, the schannel TLS plugin didn't end up built (at
least when cross compiling).

Fix other similar cases that can be found by grepping the repo.

Change-Id: Ia696e17b7aaa979d7b7f5b0801383f338a8b585b
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Martin Storsjö 2021-04-23 09:30:43 +03:00
parent 0a1256a52d
commit 236ae73ed8
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/FindWrapOpenSSL.cmake
View File

@ -18,7 +18,7 @@ if(OpenSSL_FOUND)
else() else()
set(writableLib OpenSSL::Crypto) set(writableLib OpenSSL::Crypto)
endif() endif()
set_property(TARGET ${writableLib} APPEND PROPERTY INTERFACE_LINK_LIBRARIES Ws2_32 Crypt32) set_property(TARGET ${writableLib} APPEND PROPERTY INTERFACE_LINK_LIBRARIES ws2_32 crypt32)
unset(libType) unset(libType)
unset(writableLib) unset(writableLib)
endif() endif()

4
src/network/configure.json
View File

@ -89,11 +89,11 @@
"sources": [ "sources": [
{ "type": "openssl" }, { "type": "openssl" },
{ {
"libs": "-lssleay32 -llibeay32 -lUser32 -lWs2_32 -lAdvapi32 -lGdi32", "libs": "-lssleay32 -llibeay32 -luser32 -lws2_32 -ladvapi32 -lgdi32",
"condition": "config.win32" "condition": "config.win32"
}, },
{ {
"libs": "-llibssl -llibcrypto -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32", "libs": "-llibssl -llibcrypto -luser32 -lws2_32 -ladvapi32 -lcrypt32",
"condition": "config.msvc" "condition": "config.msvc"
}, },
{ {

2
src/plugins/platforms/vnc/qvnc.cpp
View File

@ -48,7 +48,7 @@
#include <QtGui/QWindow> #include <QtGui/QWindow>
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include <Winsock2.h> #include <winsock2.h>
#else #else
#include <arpa/inet.h> #include <arpa/inet.h>
#endif #endif

2
src/plugins/platforms/vnc/qvncclient.cpp
View File

@ -47,7 +47,7 @@
#include <QtGui/qguiapplication.h> #include <QtGui/qguiapplication.h>
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include <Winsock2.h> #include <winsock2.h>
#else #else
#include <arpa/inet.h> #include <arpa/inet.h>
#endif #endif

4
src/plugins/tls/schannel/CMakeLists.txt
View File

@ -21,8 +21,8 @@ qt_internal_add_plugin(QSchannelBackend
qtlskey_schannel.cpp qtlskey_schannel_p.h qtlskey_schannel.cpp qtlskey_schannel_p.h
qx509_schannel.cpp qx509_schannel_p.h qx509_schannel.cpp qx509_schannel_p.h
LIBRARIES LIBRARIES
Crypt32 crypt32
Secur32 secur32
bcrypt bcrypt
ncrypt ncrypt
PUBLIC_LIBRARIES PUBLIC_LIBRARIES

2
src/plugins/tls/schannel/qtls_schannel_p.h
View File

@ -63,7 +63,7 @@ QT_REQUIRE_CONFIG(schannel);
#define SECURITY_WIN32 #define SECURITY_WIN32
#define SCHANNEL_USE_BLACKLISTS 1 #define SCHANNEL_USE_BLACKLISTS 1
#include <Winternl.h> // needed for UNICODE defines #include <winternl.h> // needed for UNICODE defines
#include <security.h> #include <security.h>
#include <schnlsp.h> #include <schnlsp.h>
#undef SCHANNEL_USE_BLACKLISTS #undef SCHANNEL_USE_BLACKLISTS

2
tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt
View File

@ -22,5 +22,5 @@ qt_internal_add_manual_test(qcursorhighdpi
qt_internal_extend_target(qcursorhighdpi CONDITION WIN32 qt_internal_extend_target(qcursorhighdpi CONDITION WIN32
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
User32 user32
) )

2
tests/manual/qcursor/qcursorhighdpi/qcursorhighdpi.pro
View File

@ -2,4 +2,4 @@ TEMPLATE = app
QT = core gui gui-private core-private widgets QT = core gui gui-private core-private widgets
CONFIG -= app_bundle CONFIG -= app_bundle
SOURCES += main.cpp SOURCES += main.cpp
win32: LIBS += -lUser32 win32: LIBS += -luser32