From 4dfb1eca1e7768164a5687c8940aa25421adac2b Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 11 Dec 2019 18:58:12 +0100 Subject: [PATCH] Fix qmake builds We did some changes in the .cpp files of some tests when converting the build system to CMake, but didn't adjust the .pro files which caused tests to fail when doing a qmake build. Make the required changes. Was discovered when doing a test wip/cmake -> dev merge. Change-Id: I407a982412cb44df592a38a4cb997968bdfe3304 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- tests/auto/corelib/serialization/qdatastream/qdatastream.pro | 2 ++ tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.pro | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/auto/corelib/serialization/qdatastream/qdatastream.pro b/tests/auto/corelib/serialization/qdatastream/qdatastream.pro index 25f8b889a0..469d689f3f 100644 --- a/tests/auto/corelib/serialization/qdatastream/qdatastream.pro +++ b/tests/auto/corelib/serialization/qdatastream/qdatastream.pro @@ -3,6 +3,8 @@ TARGET = tst_qdatastream QT += testlib SOURCES = tst_qdatastream.cpp +DEFINES -= QT_NO_LINKED_LIST + TESTDATA += datastream.q42 android:!android-embedded { diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.pro b/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.pro index 8f2d261899..406f3d7d36 100644 --- a/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.pro +++ b/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.pro @@ -1,6 +1,6 @@ SOURCES = qmyserver.cpp HEADERS = ../myobject.h -TARGET = qmyserver +TARGET = qmyserver_qdbusinterface DESTDIR = ./ QT = core dbus CONFIG -= app_bundle