1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tests: Fix building with qmake on Windows

Browse Source 
Apparently some library definitions went overboard, link them directly.

Pick-to: 6.0
Change-Id: I009737f7e3edff5619241b700a627dc4e25e6018
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Friedemann Kleint 2020-12-17 08:44:19 +01:00
parent f0668433c4
commit a46a723dba
24 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/corelib/io/qfile/test.pro
View File

@ -23,6 +23,6 @@ TESTDATA += \
Makefile forCopying.txt forRenaming.txt \ Makefile forCopying.txt forRenaming.txt \
resources/file1.ext1 resources/file1.ext1
win32: QMAKE_USE += ole32 uuid win32: LIBS += -lole32 -luuid
CONFIG += c++17 CONFIG += c++17

2
tests/auto/corelib/io/qfileinfo/qfileinfo.pro
View File

@ -5,7 +5,7 @@ SOURCES = tst_qfileinfo.cpp
RESOURCES += qfileinfo.qrc \ RESOURCES += qfileinfo.qrc \
testdata.qrc testdata.qrc
win32: QMAKE_USE += advapi32 netapi32 win32: LIBS += -ladvapi32 -lnetapi32
# for std::filesystem tests # for std::filesystem tests
qtConfig(c++17): CONFIG += c++17 qtConfig(c++17): CONFIG += c++17

2
tests/auto/corelib/io/qlockfile/tst_qlockfile.pro
View File

@ -3,4 +3,4 @@ TARGET = tst_qlockfile
SOURCES += tst_qlockfile.cpp SOURCES += tst_qlockfile.cpp
QT = core-private testlib concurrent QT = core-private testlib concurrent
win32: QMAKE_USE += advapi32 win32: LIBS += -ladvapi32

2
tests/auto/corelib/io/qprocess/testProcessEchoGui/testProcessEchoGui.pro
View File

@ -1,6 +1,6 @@
win32 { win32 {
SOURCES = main_win.cpp SOURCES = main_win.cpp
QMAKE_USE += user32 LIBS += -luser32
} }
CONFIG -= qt app_bundle CONFIG -= qt app_bundle

2
tests/auto/corelib/io/qprocess/testSoftExit/testSoftExit.pro
View File

@ -1,6 +1,6 @@
win32 { win32 {
SOURCES = main_win.cpp SOURCES = main_win.cpp
QMAKE_USE += user32 LIBS += -luser32
} }
unix { unix {
SOURCES = main_unix.cpp SOURCES = main_unix.cpp

2
tests/auto/corelib/io/qsettings/qsettings.pro
View File

@ -5,7 +5,7 @@ SOURCES = tst_qsettings.cpp
RESOURCES += qsettings.qrc RESOURCES += qsettings.qrc
INCLUDEPATH += $$PWD/../../kernel/qmetatype INCLUDEPATH += $$PWD/../../kernel/qmetatype
msvc: QMAKE_USE += advapi32 msvc: LIBS += -ladvapi32
darwin: LIBS += -framework CoreFoundation darwin: LIBS += -framework CoreFoundation
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

2
tests/auto/corelib/kernel/qeventloop/qeventloop.pro
View File

@ -3,6 +3,6 @@ TARGET = tst_qeventloop
QT = core network testlib core-private QT = core network testlib core-private
SOURCES = $$PWD/tst_qeventloop.cpp SOURCES = $$PWD/tst_qeventloop.cpp
win32: QMAKE_USE += user32 win32: LIBS += -luser32
qtConfig(glib): DEFINES += HAVE_GLIB qtConfig(glib): DEFINES += HAVE_GLIB

2
tests/auto/gui/image/qimage/qimage.pro
View File

@ -7,7 +7,7 @@ qtConfig(c++11): CONFIG += c++11
android:!android-embedded: RESOURCES += qimage.qrc android:!android-embedded: RESOURCES += qimage.qrc
win32: QMAKE_USE += user32 gdi32 win32: LIBS += -luser32 -lgdi32
darwin: LIBS += -framework CoreGraphics darwin: LIBS += -framework CoreGraphics
TESTDATA += images/* TESTDATA += images/*

2
tests/auto/gui/image/qpixmap/qpixmap.pro
View File

@ -5,7 +5,7 @@ QT += core-private gui-private testlib
qtHaveModule(widgets): QT += widgets widgets-private qtHaveModule(widgets): QT += widgets widgets-private
SOURCES += tst_qpixmap.cpp SOURCES += tst_qpixmap.cpp
win32: QMAKE_USE += user32 gdi32 win32: LIBS += -luser32 -lgdi32
RESOURCES += qpixmap.qrc RESOURCES += qpixmap.qrc
TESTDATA += convertFromImage/* convertFromToHICON/* loadFromData/* images/* TESTDATA += convertFromImage/* convertFromToHICON/* loadFromData/* images/*

2
tests/auto/gui/kernel/noqteventloop/noqteventloop.pro
View File

@ -5,4 +5,4 @@ QT += core-private network gui-private testlib
SOURCES += tst_noqteventloop.cpp SOURCES += tst_noqteventloop.cpp
qtConfig(dynamicgl):win32: QMAKE_USE += user32 qtConfig(dynamicgl):win32: LIBS += -luser32

2
tests/auto/gui/kernel/qwindow/qwindow.pro
View File

@ -5,4 +5,4 @@ QT += core-private gui-private testlib
SOURCES += tst_qwindow.cpp SOURCES += tst_qwindow.cpp
qtConfig(dynamicgl):win32: QMAKE_USE += user32 qtConfig(dynamicgl):win32: LIBS += user32

2
tests/auto/network/kernel/qhostaddress/qhostaddress.pro
View File

@ -4,4 +4,4 @@ SOURCES += tst_qhostaddress.cpp
QT = core network-private testlib QT = core network-private testlib
win32: QMAKE_USE += ws2_32 win32: LIBS += -lws2_32

2
tests/auto/network/kernel/qhostinfo/qhostinfo.pro
View File

@ -6,4 +6,4 @@ SOURCES += tst_qhostinfo.cpp
requires(qtConfig(private_tests)) requires(qtConfig(private_tests))
QT = core-private network-private testlib QT = core-private network-private testlib
win32: QMAKE_USE += ws2_32 win32: LIBS += -lws2_32

2
tests/auto/network/socket/platformsocketengine/platformsocketengine.pri
View File

@ -4,5 +4,5 @@ QNETWORK_SRC = $$QT_SOURCE_TREE/src/network
INCLUDEPATH += $$QNETWORK_SRC INCLUDEPATH += $$QNETWORK_SRC
win32: QMAKE_USE += ws2_32 win32: LIBS += -lws2_32

2
tests/auto/network/socket/qtcpserver/test/test.pro
View File

@ -1,7 +1,7 @@
CONFIG += testcase CONFIG += testcase
SOURCES += ../tst_qtcpserver.cpp SOURCES += ../tst_qtcpserver.cpp
win32: QMAKE_USE += ws2_32 win32: LIBS += -lws2_32
TARGET = tst_qtcpserver TARGET = tst_qtcpserver

2
tests/auto/network/socket/qtcpsocket/test/test.pro
View File

@ -3,7 +3,7 @@ CONFIG += testcase
QT = core-private network-private testlib QT = core-private network-private testlib
SOURCES += ../tst_qtcpsocket.cpp SOURCES += ../tst_qtcpsocket.cpp
win32: QMAKE_USE += ws2_32 win32: LIBS += -lws2_32
TARGET = tst_qtcpsocket TARGET = tst_qtcpsocket
win32 { win32 {

5
tests/auto/other/qaccessibility/qaccessibility.pro
View File

@ -7,7 +7,4 @@ HEADERS += accessiblewidgets.h
unix:!darwin:!haiku:!integity: LIBS += -lm unix:!darwin:!haiku:!integity: LIBS += -lm
win32 { win32: LIBS += -loleacc -loleaut32 -lole32 -luuid
LIBS += -loleacc -loleaut32
QMAKE_USE += ole32 uuid
}

2
tests/auto/tools/qmakelib/qmakelib.pro
View File

@ -1,7 +1,7 @@
CONFIG += testcase CONFIG += testcase
TARGET = tst_qmakelib TARGET = tst_qmakelib
QT = core testlib core-private QT = core testlib core-private
win32: QMAKE_USE += advapi32 win32: LIBS += -ladvapi32
INCLUDEPATH += ../../../../qmake/library INCLUDEPATH += ../../../../qmake/library
VPATH += ../../../../qmake/library VPATH += ../../../../qmake/library

2
tests/auto/widgets/graphicsview/qgraphicsitem/qgraphicsitem.pro
View File

@ -5,4 +5,4 @@ QT += core-private gui-private
SOURCES += tst_qgraphicsitem.cpp SOURCES += tst_qgraphicsitem.cpp
DEFINES += QT_NO_CAST_TO_ASCII DEFINES += QT_NO_CAST_TO_ASCII
win32: QMAKE_USE += user32 win32: LIBS += -luser32

2
tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro
View File

@ -4,7 +4,7 @@ QT += widgets widgets-private testlib
QT += core-private gui-private QT += core-private gui-private
SOURCES += tst_qgraphicsscene.cpp SOURCES += tst_qgraphicsscene.cpp
RESOURCES += images.qrc RESOURCES += images.qrc
win32: QMAKE_USE += user32 win32: LIBS += -luser32
DEFINES += SRCDIR=\\\"$$PWD\\\" DEFINES += SRCDIR=\\\"$$PWD\\\"
DEFINES += QT_NO_CAST_TO_ASCII DEFINES += QT_NO_CAST_TO_ASCII

2
tests/auto/widgets/itemviews/qitemdelegate/qitemdelegate.pro
View File

@ -3,4 +3,4 @@ TARGET = tst_qitemdelegate
QT += widgets widgets-private testlib QT += widgets widgets-private testlib
SOURCES += tst_qitemdelegate.cpp SOURCES += tst_qitemdelegate.cpp
win32: QMAKE_USE += user32 win32: LIBS += -luser32

2
tests/auto/widgets/itemviews/qlistview/qlistview.pro
View File

@ -2,4 +2,4 @@ CONFIG += testcase
TARGET = tst_qlistview TARGET = tst_qlistview
QT += widgets gui-private widgets-private core-private testlib testlib-private QT += widgets gui-private widgets-private core-private testlib testlib-private
SOURCES += tst_qlistview.cpp SOURCES += tst_qlistview.cpp
win32: QMAKE_USE += user32 win32: LIBS += -luser32

2
tests/auto/widgets/kernel/qwidget/qwidget.pro
View File

@ -16,4 +16,4 @@ mac {
OBJECTIVE_SOURCES += tst_qwidget_mac_helpers.mm OBJECTIVE_SOURCES += tst_qwidget_mac_helpers.mm
} }
win32: QMAKE_USE += user32 gdi32 win32: LIBS += -luser32 -lgdi32

2
tests/auto/widgets/widgets/qtabwidget/qtabwidget.pro
View File

@ -8,4 +8,4 @@ INCLUDEPATH += ../
HEADERS += HEADERS +=
SOURCES += tst_qtabwidget.cpp SOURCES += tst_qtabwidget.cpp
win32: QMAKE_USE += user32 win32: LIBS += -luser32