Remove capitalization when specifying include-libraries.
authorkb <k.blammo@gmail.com>
Sun, 13 May 2012 20:55:15 +0000 (22:55 +0200)
committerQt by Nokia <qt-info@nokia.com>
Mon, 14 May 2012 19:34:08 +0000 (21:34 +0200)
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>
14 files changed:
src/3rdparty/iaccessible2/iaccessible2.pri
src/network/kernel/qauthenticator.cpp
src/network/socket/qlocalserver_win.cpp
src/network/socket/socket.pri
src/plugins/bearer/nla/nla.pro
src/plugins/platforms/windows/windows.pro
src/plugins/printsupport/windows/windows.pro
src/printsupport/kernel/kernel.pri
tests/auto/corelib/io/qprocess/testProcessEchoGui/testProcessEchoGui.pro
tests/auto/corelib/io/qprocess/testSoftExit/testSoftExit.pro
tests/auto/widgets/graphicsview/qgraphicsitem/qgraphicsitem.pro
tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro
tests/auto/widgets/itemviews/qitemdelegate/qitemdelegate.pro
tests/benchmarks/sql/kernel/qsqlquery/qsqlquery.pro

index f89655a..d827447 100644 (file)
@@ -85,4 +85,4 @@ OTHER_FILES = \
     $$PWD/idl/IA2CommonTypes.idl \
     $$PWD/idl/IA2TypeLibrary.idl
 
-LIBS += -lRpcRT4
+LIBS += -lrpcrt4
index afefdb7..c1df457 100644 (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
index 00eae32..3304c6c 100644 (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
index 39b214f..3429275 100644 (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 \
index 5444269..29e9895 100644 (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 \
index 5fcf9bf..7b27a94 100644 (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
index 97d90a6..3c5f22d 100644 (file)
@@ -19,4 +19,4 @@ OTHER_FILES += windows.json
 
 target.path += $$[QT_INSTALL_PLUGINS]/printsupport
 INSTALLS += target
-LIBS += -lWinspool -lComdlg32
+LIBS += -lwinspool -lcomdlg32
index 10d9f87..1ab9c3a 100644 (file)
@@ -30,7 +30,7 @@ win32 {
                 $$PWD/qprintengine_win_p.h
         SOURCES += \
                 $$PWD/qprintengine_win.cpp
-        LIBS += -lWinspool -lComdlg32
+        LIBS += -lwinspool -lcomdlg32
 }
 
 mac|win32 {
index bedc76a..6c247b0 100644 (file)
@@ -1,6 +1,6 @@
 win32 {
    SOURCES = main_win.cpp
-   !win32-borland:LIBS += -lUser32
+   !win32-borland:LIBS += -luser32
 }
 
 CONFIG -= qt app_bundle
index d5f30bc..ea6bdd7 100644 (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
index 4c30b62..3effc88 100644 (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
index 8a08447..c9c6f3c 100644 (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
index d90f6fd..cb935fd 100644 (file)
@@ -3,4 +3,4 @@ TARGET = tst_qitemdelegate
 QT += widgets testlib
 SOURCES         += tst_qitemdelegate.cpp
 
-win32:!wince*: LIBS += -lUser32
+win32:!wince*: LIBS += -luser32
index 01bf546..941cfa5 100644 (file)
@@ -3,4 +3,4 @@ TARGET = tst_bench_qsqlquery
 SOURCES += main.cpp
 
 QT = core sql testlib
-win32: LIBS += -lWs2_32
+win32: LIBS += -lws2_32