From: kb Date: Sun, 13 May 2012 20:55:15 +0000 (+0200) Subject: Remove capitalization when specifying include-libraries. X-Git-Tag: 071012110112~1027 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cff6e39cd1aea203751113124f6d05d4198cabcd;p=profile%2Fivi%2Fqtbase.git 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 Reviewed-by: Oswald Buddenhagen --- diff --git a/src/3rdparty/iaccessible2/iaccessible2.pri b/src/3rdparty/iaccessible2/iaccessible2.pri index f89655a..d827447 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 afefdb7..c1df457 100644 --- a/src/network/kernel/qauthenticator.cpp +++ b/src/network/kernel/qauthenticator.cpp @@ -56,7 +56,7 @@ #include #include #define SECURITY_WIN32 1 -#include +#include #endif //#define NTLMV1_CLIENT diff --git a/src/network/socket/qlocalserver_win.cpp b/src/network/socket/qlocalserver_win.cpp index 00eae32..3304c6c 100644 --- a/src/network/socket/qlocalserver_win.cpp +++ b/src/network/socket/qlocalserver_win.cpp @@ -46,9 +46,9 @@ #include -#include -#include -#include +#include +#include +#include // 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 39b214f..3429275 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 5444269..29e9895 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 5fcf9bf..7b27a94 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 97d90a6..3c5f22d 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 10d9f87..1ab9c3a 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 bedc76a..6c247b0 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 d5f30bc..ea6bdd7 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 4c30b62..3effc88 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 8a08447..c9c6f3c 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 d90f6fd..cb935fd 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 01bf546..941cfa5 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