whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove capitalization when specifying include-libraries. 

MinGW installations on case-sensitive filesystems expect
lowercase names of include-libraries and (usually) include
files.
When crosscompiling on Debian 6 (targeting MS Windows) linking
fails because mingw is looking for non-existent include-libraries.
Using lowercase names solves this.

Change-Id: Id3454f4ed8ba42b6ea93d65d9c0ce567db6712df
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
bb10
kb 2012-05-13 22:55:15 +02:00 committed by Qt by Nokia
parent 9bd24b6edc
commit cff6e39cd1
14 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/3rdparty/iaccessible2/iaccessible2.pri vendored
View File

@ -85,4 +85,4 @@ OTHER_FILES = \
$$PWD/idl/IA2CommonTypes.idl \
$$PWD/idl/IA2TypeLibrary.idl
LIBS += -lRpcRT4
LIBS += -lrpcrt4

2
src/network/kernel/qauthenticator.cpp
View File

@ -56,7 +56,7 @@
#include <private/qmutexpool_p.h>
#include <rpc.h>
#define SECURITY_WIN32 1
#include <Security.h>
#include <security.h>
#endif
//#define NTLMV1_CLIENT

6
src/network/socket/qlocalserver_win.cpp
View File

@ -46,9 +46,9 @@
#include <qdebug.h>
#include <Aclapi.h>
#include <AccCtrl.h>
#include <Sddl.h>
#include <aclapi.h>
#include <accctrl.h>
#include <sddl.h>
// The buffer size need to be 0 otherwise data could be
// lost if the socket that has written data closes the connection

2
src/network/socket/socket.pri
View File

@ -40,7 +40,7 @@ win32:SOURCES += socket/qnativesocketengine_win.cpp \
socket/qlocalsocket_win.cpp \
socket/qlocalserver_win.cpp
win32:!wince*:LIBS += -lAdvapi32
win32:!wince*:LIBS += -ladvapi32
wince*: {
SOURCES -= socket/qlocalsocket_win.cpp \

4
src/plugins/bearer/nla/nla.pro
View File

@ -4,9 +4,9 @@ load(qt_plugin)
QT = core core-private network network-private
!wince* {
LIBS += -lWs2_32
LIBS += -lws2_32
} else {
LIBS += -lWs2
LIBS += -lws2
}
HEADERS += qnlaengine.h \

2
src/plugins/platforms/windows/windows.pro
View File

@ -11,7 +11,7 @@ QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms
# Note: OpenGL32 must precede Gdi32 as it overwrites some functions.
LIBS *= -lole32
!wince*:LIBS *= -lgdi32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32
contains(QT_CONFIG, opengl):LIBS *= -lOpenGL32
contains(QT_CONFIG, opengl):LIBS *= -lopengl32
win32-g++: LIBS *= -luuid
# For the dialog helpers:
!wince*:LIBS *= -lshlwapi -lshell32

2
src/plugins/printsupport/windows/windows.pro
View File

@ -19,4 +19,4 @@ OTHER_FILES += windows.json
target.path += $$[QT_INSTALL_PLUGINS]/printsupport
INSTALLS += target
LIBS += -lWinspool -lComdlg32
LIBS += -lwinspool -lcomdlg32

2
src/printsupport/kernel/kernel.pri
View File

@ -30,7 +30,7 @@ win32 {
$$PWD/qprintengine_win_p.h
SOURCES += \
$$PWD/qprintengine_win.cpp
LIBS += -lWinspool -lComdlg32
LIBS += -lwinspool -lcomdlg32
}
mac|win32 {

2
tests/auto/corelib/io/qprocess/testProcessEchoGui/testProcessEchoGui.pro
View File

@ -1,6 +1,6 @@
win32 {
SOURCES = main_win.cpp
!win32-borland:LIBS += -lUser32
!win32-borland:LIBS += -luser32
}
CONFIG -= qt app_bundle

2
tests/auto/corelib/io/qprocess/testSoftExit/testSoftExit.pro
View File

@ -1,6 +1,6 @@
win32 {
SOURCES = main_win.cpp
!win32-borland:!wince*:LIBS += -lUser32
!win32-borland:!wince*:LIBS += -luser32
}
unix {
SOURCES = main_unix.cpp

2
tests/auto/widgets/graphicsview/qgraphicsitem/qgraphicsitem.pro
View File

@ -5,4 +5,4 @@ QT += core-private gui-private
SOURCES += tst_qgraphicsitem.cpp
DEFINES += QT_NO_CAST_TO_ASCII
win32:!wince*: LIBS += -lUser32
win32:!wince*: LIBS += -luser32

2
tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro
View File

@ -4,7 +4,7 @@ QT += widgets widgets-private testlib
QT += core-private gui-private
SOURCES += tst_qgraphicsscene.cpp
RESOURCES += images.qrc
win32:!wince*: LIBS += -lUser32
win32:!wince*: LIBS += -luser32
!wince*:DEFINES += SRCDIR=\\\"$$PWD\\\"
DEFINES += QT_NO_CAST_TO_ASCII

2
tests/auto/widgets/itemviews/qitemdelegate/qitemdelegate.pro
View File

@ -3,4 +3,4 @@ TARGET = tst_qitemdelegate
QT += widgets testlib
SOURCES += tst_qitemdelegate.cpp
win32:!wince*: LIBS += -lUser32
win32:!wince*: LIBS += -luser32

2
tests/benchmarks/sql/kernel/qsqlquery/qsqlquery.pro
View File

@ -3,4 +3,4 @@ TARGET = tst_bench_qsqlquery
SOURCES += main.cpp
QT = core sql testlib
win32: LIBS += -lWs2_32
win32: LIBS += -lws2_32