summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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
-rw-r--r--tests/auto/corelib/io/qprocess/testProcessEchoGui/testProcessEchoGui.pro2
-rw-r--r--tests/auto/corelib/io/qprocess/testSoftExit/testSoftExit.pro2
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsitem/qgraphicsitem.pro2
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro2
-rw-r--r--tests/auto/widgets/itemviews/qitemdelegate/qitemdelegate.pro2
-rw-r--r--tests/benchmarks/sql/kernel/qsqlquery/qsqlquery.pro2
14 files changed, 17 insertions, 17 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 {
diff --git a/tests/auto/corelib/io/qprocess/testProcessEchoGui/testProcessEchoGui.pro b/tests/auto/corelib/io/qprocess/testProcessEchoGui/testProcessEchoGui.pro
index bedc76aa5b..6c247b0216 100644
--- a/tests/auto/corelib/io/qprocess/testProcessEchoGui/testProcessEchoGui.pro
+++ b/tests/auto/corelib/io/qprocess/testProcessEchoGui/testProcessEchoGui.pro
@@ -1,6 +1,6 @@
win32 {
SOURCES = main_win.cpp
- !win32-borland:LIBS += -lUser32
+ !win32-borland:LIBS += -luser32
}
CONFIG -= qt app_bundle
diff --git a/tests/auto/corelib/io/qprocess/testSoftExit/testSoftExit.pro b/tests/auto/corelib/io/qprocess/testSoftExit/testSoftExit.pro
index d5f30bc35d..ea6bdd7bbd 100644
--- a/tests/auto/corelib/io/qprocess/testSoftExit/testSoftExit.pro
+++ b/tests/auto/corelib/io/qprocess/testSoftExit/testSoftExit.pro
@@ -1,6 +1,6 @@
win32 {
SOURCES = main_win.cpp
- !win32-borland:!wince*:LIBS += -lUser32
+ !win32-borland:!wince*:LIBS += -luser32
}
unix {
SOURCES = main_unix.cpp
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/qgraphicsitem.pro b/tests/auto/widgets/graphicsview/qgraphicsitem/qgraphicsitem.pro
index 4c30b6264b..3effc881d2 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsitem/qgraphicsitem.pro
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/qgraphicsitem.pro
@@ -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
diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro b/tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro
index 8a084472b8..c9c6f3c5c1 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro
@@ -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
diff --git a/tests/auto/widgets/itemviews/qitemdelegate/qitemdelegate.pro b/tests/auto/widgets/itemviews/qitemdelegate/qitemdelegate.pro
index d90f6fd154..cb935fd2fd 100644
--- a/tests/auto/widgets/itemviews/qitemdelegate/qitemdelegate.pro
+++ b/tests/auto/widgets/itemviews/qitemdelegate/qitemdelegate.pro
@@ -3,4 +3,4 @@ TARGET = tst_qitemdelegate
QT += widgets testlib
SOURCES += tst_qitemdelegate.cpp
-win32:!wince*: LIBS += -lUser32
+win32:!wince*: LIBS += -luser32
diff --git a/tests/benchmarks/sql/kernel/qsqlquery/qsqlquery.pro b/tests/benchmarks/sql/kernel/qsqlquery/qsqlquery.pro
index 01bf54621b..941cfa5a78 100644
--- a/tests/benchmarks/sql/kernel/qsqlquery/qsqlquery.pro
+++ b/tests/benchmarks/sql/kernel/qsqlquery/qsqlquery.pro
@@ -3,4 +3,4 @@ TARGET = tst_bench_qsqlquery
SOURCES += main.cpp
QT = core sql testlib
-win32: LIBS += -lWs2_32
+win32: LIBS += -lws2_32