summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorkb <k.blammo@gmail.com>2012-05-13 22:55:15 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-14 21:34:08 +0200
commitcff6e39cd1aea203751113124f6d05d4198cabcd (patch)
tree73fd285531afe725ac5d552a3c47d1735e811316 /src
parent9bd24b6edc7c15dffe382e226c782b394b40c632 (diff)
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>
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/iaccessible2/iaccessible2.pri2
-rw-r--r--src/network/kernel/qauthenticator.cpp2
-rw-r--r--src/network/socket/qlocalserver_win.cpp6
-rw-r--r--src/network/socket/socket.pri2
-rw-r--r--src/plugins/bearer/nla/nla.pro4
-rw-r--r--src/plugins/platforms/windows/windows.pro2
-rw-r--r--src/plugins/printsupport/windows/windows.pro2
-rw-r--r--src/printsupport/kernel/kernel.pri2
8 files changed, 11 insertions, 11 deletions
diff --git a/src/3rdparty/iaccessible2/iaccessible2.pri b/src/3rdparty/iaccessible2/iaccessible2.pri
index f89655a9a0..d82744788e 100644
--- a/src/3rdparty/iaccessible2/iaccessible2.pri
+++ b/src/3rdparty/iaccessible2/iaccessible2.pri
@@ -85,4 +85,4 @@ OTHER_FILES = \
$$PWD/idl/IA2CommonTypes.idl \
$$PWD/idl/IA2TypeLibrary.idl
-LIBS += -lRpcRT4
+LIBS += -lrpcrt4
diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp
index afefdb7a99..c1df4571d3 100644
--- a/src/network/kernel/qauthenticator.cpp
+++ b/src/network/kernel/qauthenticator.cpp
@@ -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
diff --git a/src/network/socket/qlocalserver_win.cpp b/src/network/socket/qlocalserver_win.cpp
index 00eae32c99..3304c6c6a0 100644
--- a/src/network/socket/qlocalserver_win.cpp
+++ b/src/network/socket/qlocalserver_win.cpp
@@ -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
diff --git a/src/network/socket/socket.pri b/src/network/socket/socket.pri
index 39b214ffb9..3429275a67 100644
--- a/src/network/socket/socket.pri
+++ b/src/network/socket/socket.pri
@@ -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 \
diff --git a/src/plugins/bearer/nla/nla.pro b/src/plugins/bearer/nla/nla.pro
index 5444269f1f..29e98953b1 100644
--- a/src/plugins/bearer/nla/nla.pro
+++ b/src/plugins/bearer/nla/nla.pro
@@ -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 \
diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro
index 5fcf9bfcc9..7b27a942bc 100644
--- a/src/plugins/platforms/windows/windows.pro
+++ b/src/plugins/platforms/windows/windows.pro
@@ -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
diff --git a/src/plugins/printsupport/windows/windows.pro b/src/plugins/printsupport/windows/windows.pro
index 97d90a6a9d..3c5f22d411 100644
--- a/src/plugins/printsupport/windows/windows.pro
+++ b/src/plugins/printsupport/windows/windows.pro
@@ -19,4 +19,4 @@ OTHER_FILES += windows.json
target.path += $$[QT_INSTALL_PLUGINS]/printsupport
INSTALLS += target
-LIBS += -lWinspool -lComdlg32
+LIBS += -lwinspool -lcomdlg32
diff --git a/src/printsupport/kernel/kernel.pri b/src/printsupport/kernel/kernel.pri
index 10d9f877a0..1ab9c3a0eb 100644
--- a/src/printsupport/kernel/kernel.pri
+++ b/src/printsupport/kernel/kernel.pri
@@ -30,7 +30,7 @@ win32 {
$$PWD/qprintengine_win_p.h
SOURCES += \
$$PWD/qprintengine_win.cpp
- LIBS += -lWinspool -lComdlg32
+ LIBS += -lwinspool -lcomdlg32
}
mac|win32 {