Tests: Fix building with qmake on Windows

Apparently some library definitions went overboard, link them directly. Pick-to: 6.0 Change-Id: I009737f7e3edff5619241b700a627dc4e25e6018 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-12-17 08:44:19 +01:00 · 2020-12-17 08:44:19 +01:00 · a46a723dba
commit a46a723dba
parent f0668433c4
24 changed files with 24 additions and 27 deletions
--- a/tests/auto/corelib/io/qfile/test.pro
+++ b/tests/auto/corelib/io/qfile/test.pro
@ -23,6 +23,6 @@ TESTDATA += \
    Makefile forCopying.txt forRenaming.txt \
    resources/file1.ext1

-win32: QMAKE_USE += ole32 uuid
+win32: LIBS += -lole32 -luuid

 CONFIG += c++17
--- a/tests/auto/corelib/io/qfileinfo/qfileinfo.pro
+++ b/tests/auto/corelib/io/qfileinfo/qfileinfo.pro
@ -5,7 +5,7 @@ SOURCES = tst_qfileinfo.cpp
 RESOURCES += qfileinfo.qrc \
    testdata.qrc

-win32: QMAKE_USE += advapi32 netapi32
+win32: LIBS += -ladvapi32 -lnetapi32

 # for std::filesystem tests
 qtConfig(c++17): CONFIG += c++17
--- a/tests/auto/corelib/io/qlockfile/tst_qlockfile.pro
+++ b/tests/auto/corelib/io/qlockfile/tst_qlockfile.pro
@ -3,4 +3,4 @@ TARGET = tst_qlockfile
 SOURCES += tst_qlockfile.cpp

 QT = core-private testlib concurrent
-win32: QMAKE_USE += advapi32
+win32: LIBS += -ladvapi32
--- 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
-   QMAKE_USE += user32
+   LIBS += -luser32
 }

 CONFIG -= qt app_bundle
--- 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
-   QMAKE_USE += user32
+   LIBS += -luser32
 }
 unix {
   SOURCES = main_unix.cpp
--- a/tests/auto/corelib/io/qsettings/qsettings.pro
+++ b/tests/auto/corelib/io/qsettings/qsettings.pro
@ -5,7 +5,7 @@ SOURCES = tst_qsettings.cpp
 RESOURCES += qsettings.qrc
 INCLUDEPATH += $$PWD/../../kernel/qmetatype

-msvc: QMAKE_USE += advapi32
+msvc: LIBS += -ladvapi32
 darwin: LIBS += -framework CoreFoundation

 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
--- a/tests/auto/corelib/kernel/qeventloop/qeventloop.pro
+++ b/tests/auto/corelib/kernel/qeventloop/qeventloop.pro
@ -3,6 +3,6 @@ TARGET = tst_qeventloop
 QT = core network testlib core-private
 SOURCES = $$PWD/tst_qeventloop.cpp

-win32: QMAKE_USE += user32
+win32: LIBS += -luser32

 qtConfig(glib): DEFINES += HAVE_GLIB
--- a/tests/auto/gui/image/qimage/qimage.pro
+++ b/tests/auto/gui/image/qimage/qimage.pro
@ -7,7 +7,7 @@ qtConfig(c++11): CONFIG += c++11

 android:!android-embedded: RESOURCES += qimage.qrc

-win32: QMAKE_USE += user32 gdi32
+win32: LIBS += -luser32 -lgdi32
 darwin: LIBS += -framework CoreGraphics

 TESTDATA += images/*
--- a/tests/auto/gui/image/qpixmap/qpixmap.pro
+++ b/tests/auto/gui/image/qpixmap/qpixmap.pro
@ -5,7 +5,7 @@ QT += core-private gui-private testlib
 qtHaveModule(widgets): QT += widgets widgets-private

 SOURCES  += tst_qpixmap.cpp
-win32: QMAKE_USE += user32 gdi32
+win32: LIBS += -luser32 -lgdi32

 RESOURCES += qpixmap.qrc
 TESTDATA += convertFromImage/* convertFromToHICON/* loadFromData/* images/*
--- a/tests/auto/gui/kernel/noqteventloop/noqteventloop.pro
+++ b/tests/auto/gui/kernel/noqteventloop/noqteventloop.pro
@ -5,4 +5,4 @@ QT += core-private network gui-private testlib

 SOURCES  += tst_noqteventloop.cpp

-qtConfig(dynamicgl):win32: QMAKE_USE += user32
+qtConfig(dynamicgl):win32: LIBS += -luser32
--- a/tests/auto/gui/kernel/qwindow/qwindow.pro
+++ b/tests/auto/gui/kernel/qwindow/qwindow.pro
@ -5,4 +5,4 @@ QT += core-private gui-private testlib

 SOURCES  += tst_qwindow.cpp

-qtConfig(dynamicgl):win32: QMAKE_USE += user32
+qtConfig(dynamicgl):win32: LIBS += user32
--- a/tests/auto/network/kernel/qhostaddress/qhostaddress.pro
+++ b/tests/auto/network/kernel/qhostaddress/qhostaddress.pro
@ -4,4 +4,4 @@ SOURCES  += tst_qhostaddress.cpp

 QT = core network-private testlib

-win32: QMAKE_USE += ws2_32
+win32: LIBS += -lws2_32
--- a/tests/auto/network/kernel/qhostinfo/qhostinfo.pro
+++ b/tests/auto/network/kernel/qhostinfo/qhostinfo.pro
@ -6,4 +6,4 @@ SOURCES  += tst_qhostinfo.cpp
 requires(qtConfig(private_tests))
 QT = core-private network-private testlib

-win32: QMAKE_USE += ws2_32
+win32: LIBS += -lws2_32
--- a/tests/auto/network/socket/platformsocketengine/platformsocketengine.pri
+++ b/tests/auto/network/socket/platformsocketengine/platformsocketengine.pri
@ -4,5 +4,5 @@ QNETWORK_SRC = $$QT_SOURCE_TREE/src/network

 INCLUDEPATH += $$QNETWORK_SRC

-win32: QMAKE_USE += ws2_32
+win32: LIBS += -lws2_32

--- a/tests/auto/network/socket/qtcpserver/test/test.pro
+++ b/tests/auto/network/socket/qtcpserver/test/test.pro
@ -1,7 +1,7 @@
 CONFIG += testcase
 SOURCES  += ../tst_qtcpserver.cpp

-win32: QMAKE_USE += ws2_32
+win32: LIBS += -lws2_32

 TARGET = tst_qtcpserver

--- a/tests/auto/network/socket/qtcpsocket/test/test.pro
+++ b/tests/auto/network/socket/qtcpsocket/test/test.pro
@ -3,7 +3,7 @@ CONFIG += testcase
 QT = core-private network-private testlib
 SOURCES += ../tst_qtcpsocket.cpp

-win32: QMAKE_USE += ws2_32
+win32: LIBS += -lws2_32
 TARGET = tst_qtcpsocket

 win32 {
--- a/tests/auto/other/qaccessibility/qaccessibility.pro
+++ b/tests/auto/other/qaccessibility/qaccessibility.pro
@ -7,7 +7,4 @@ HEADERS += accessiblewidgets.h

 unix:!darwin:!haiku:!integity: LIBS += -lm

-win32 {
-    LIBS += -loleacc -loleaut32
-    QMAKE_USE += ole32 uuid
-}
+win32: LIBS += -loleacc -loleaut32 -lole32 -luuid
--- a/tests/auto/tools/qmakelib/qmakelib.pro
+++ b/tests/auto/tools/qmakelib/qmakelib.pro
@ -1,7 +1,7 @@
 CONFIG += testcase
 TARGET = tst_qmakelib
 QT = core testlib core-private
-win32: QMAKE_USE += advapi32
+win32: LIBS += -ladvapi32

 INCLUDEPATH += ../../../../qmake/library
 VPATH += ../../../../qmake/library
--- 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: QMAKE_USE += user32
+win32: LIBS += -luser32
--- 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: QMAKE_USE += user32
+win32: LIBS += -luser32

 DEFINES += SRCDIR=\\\"$$PWD\\\"
 DEFINES += QT_NO_CAST_TO_ASCII
--- 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 widgets-private testlib
 SOURCES         += tst_qitemdelegate.cpp

-win32: QMAKE_USE += user32
+win32: LIBS += -luser32
--- a/tests/auto/widgets/itemviews/qlistview/qlistview.pro
+++ b/tests/auto/widgets/itemviews/qlistview/qlistview.pro
@ -2,4 +2,4 @@ CONFIG += testcase
 TARGET = tst_qlistview
 QT += widgets gui-private widgets-private core-private testlib testlib-private
 SOURCES  += tst_qlistview.cpp
-win32: QMAKE_USE += user32
+win32: LIBS += -luser32
--- a/tests/auto/widgets/kernel/qwidget/qwidget.pro
+++ b/tests/auto/widgets/kernel/qwidget/qwidget.pro
@ -16,4 +16,4 @@ mac {
    OBJECTIVE_SOURCES += tst_qwidget_mac_helpers.mm
 }

-win32: QMAKE_USE += user32 gdi32
+win32: LIBS += -luser32 -lgdi32
--- a/tests/auto/widgets/widgets/qtabwidget/qtabwidget.pro
+++ b/tests/auto/widgets/widgets/qtabwidget/qtabwidget.pro
@ -8,4 +8,4 @@ INCLUDEPATH += ../
 HEADERS +=  
 SOURCES += tst_qtabwidget.cpp

-win32: QMAKE_USE += user32
+win32: LIBS += -luser32