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>

24 files changed, 24 insertions, 27 deletions

diff --git a/tests/auto/corelib/io/qfile/test.pro b/tests/auto/corelib/io/qfile/test.pro
index 7841973a65..aca7d29fcd 100644
--- 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
diff --git a/tests/auto/corelib/io/qfileinfo/qfileinfo.pro b/tests/auto/corelib/io/qfileinfo/qfileinfo.pro
index 7c0e6f1537..4bf198e171 100644
--- 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
diff --git a/tests/auto/corelib/io/qlockfile/tst_qlockfile.pro b/tests/auto/corelib/io/qlockfile/tst_qlockfile.pro
index 8ac76b0317..db0024864a 100644
--- 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
diff --git a/tests/auto/corelib/io/qprocess/testProcessEchoGui/testProcessEchoGui.pro b/tests/auto/corelib/io/qprocess/testProcessEchoGui/testProcessEchoGui.pro
index e41ed0a425..935f43630c 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
-   QMAKE_USE += user32
+   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 964c47f6ae..2cfcb4794e 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
-   QMAKE_USE += user32
+   LIBS += -luser32
 }
 unix {
    SOURCES = main_unix.cpp
diff --git a/tests/auto/corelib/io/qsettings/qsettings.pro b/tests/auto/corelib/io/qsettings/qsettings.pro
index 98ea337e7f..bc88a0fa42 100644
--- 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
diff --git a/tests/auto/corelib/kernel/qeventloop/qeventloop.pro b/tests/auto/corelib/kernel/qeventloop/qeventloop.pro
index 827ecec883..edbc0db177 100644
--- 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
diff --git a/tests/auto/gui/image/qimage/qimage.pro b/tests/auto/gui/image/qimage/qimage.pro
index c8aa16732e..881a04dd94 100644
--- 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/*
diff --git a/tests/auto/gui/image/qpixmap/qpixmap.pro b/tests/auto/gui/image/qpixmap/qpixmap.pro
index 65294c6aeb..c70fd6b55e 100644
--- 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/*
diff --git a/tests/auto/gui/kernel/noqteventloop/noqteventloop.pro b/tests/auto/gui/kernel/noqteventloop/noqteventloop.pro
index 7394c6b6ac..f538dd534a 100644
--- 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
diff --git a/tests/auto/gui/kernel/qwindow/qwindow.pro b/tests/auto/gui/kernel/qwindow/qwindow.pro
index f97d4ef789..add42d4912 100644
--- 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
diff --git a/tests/auto/network/kernel/qhostaddress/qhostaddress.pro b/tests/auto/network/kernel/qhostaddress/qhostaddress.pro
index d170d879e6..b092aa046d 100644
--- 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
diff --git a/tests/auto/network/kernel/qhostinfo/qhostinfo.pro b/tests/auto/network/kernel/qhostinfo/qhostinfo.pro
index e084f28229..272999cff1 100644
--- 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
diff --git a/tests/auto/network/socket/platformsocketengine/platformsocketengine.pri b/tests/auto/network/socket/platformsocketengine/platformsocketengine.pri
index 1b304bfc69..2247a43c3c 100644
--- 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
 
diff --git a/tests/auto/network/socket/qtcpserver/test/test.pro b/tests/auto/network/socket/qtcpserver/test/test.pro
index 491ff28cdc..3e4ca8cbf6 100644
--- 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
 
diff --git a/tests/auto/network/socket/qtcpsocket/test/test.pro b/tests/auto/network/socket/qtcpsocket/test/test.pro
index 4c07b1ec66..ceffe28fff 100644
--- 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 {
diff --git a/tests/auto/other/qaccessibility/qaccessibility.pro b/tests/auto/other/qaccessibility/qaccessibility.pro
index 65fdbdc103..f909627cb7 100644
--- 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
diff --git a/tests/auto/tools/qmakelib/qmakelib.pro b/tests/auto/tools/qmakelib/qmakelib.pro
index 0581832e31..b737ebf6fa 100644
--- 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
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/qgraphicsitem.pro b/tests/auto/widgets/graphicsview/qgraphicsitem/qgraphicsitem.pro
index 7c95972222..20d628aea2 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: QMAKE_USE += user32
+win32: LIBS += -luser32
diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro b/tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro
index 72c6169afd..00a3562283 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: QMAKE_USE += user32
+win32: LIBS += -luser32
 
 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 fc617b0e5d..f004397a48 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 widgets-private testlib
 SOURCES         += tst_qitemdelegate.cpp
 
-win32: QMAKE_USE += user32
+win32: LIBS += -luser32
diff --git a/tests/auto/widgets/itemviews/qlistview/qlistview.pro b/tests/auto/widgets/itemviews/qlistview/qlistview.pro
index 7e2062e86e..c552c9a088 100644
--- 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
diff --git a/tests/auto/widgets/kernel/qwidget/qwidget.pro b/tests/auto/widgets/kernel/qwidget/qwidget.pro
index 98c0102d9f..56d3ee7b96 100644
--- 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
diff --git a/tests/auto/widgets/widgets/qtabwidget/qtabwidget.pro b/tests/auto/widgets/widgets/qtabwidget/qtabwidget.pro
index 95c81b952f..a0f70ad1d4 100644
--- 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