From f7a815125a14f210cfde132bc7e6e61cf244bbbe Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 25 Apr 2022 10:03:43 +0200 Subject: [PATCH] Fix building the dbus examples in CI with qmake and MSVC The usage of nmake inference rules leads to the wrong .cpp file being picked up by nmake/jom. See details in the linked issue. This partly cherry-picks fb656c036db0549180073e133773862d08f6cd24. Task-number: QTBUG-96513 Change-Id: I97494cf6f46bafe29b18c74af490218e66eb0cef Reviewed-by: Alexandru Croitor --- examples/dbus/chat/chat.pro | 2 ++ examples/dbus/remotecontrolledcar/car/car.pro | 2 ++ 2 files changed, 4 insertions(+) diff --git a/examples/dbus/chat/chat.pro b/examples/dbus/chat/chat.pro index 631a8769548..93d3178177d 100644 --- a/examples/dbus/chat/chat.pro +++ b/examples/dbus/chat/chat.pro @@ -7,6 +7,8 @@ FORMS += chatmainwindow.ui chatsetnickname.ui DBUS_ADAPTORS += org.example.chat.xml DBUS_INTERFACES += org.example.chat.xml +CONFIG += no_batch # work around QTBUG-96513 + # install target.path = $$[QT_INSTALL_EXAMPLES]/dbus/chat INSTALLS += target diff --git a/examples/dbus/remotecontrolledcar/car/car.pro b/examples/dbus/remotecontrolledcar/car/car.pro index 35a186c7fe9..5e354e3d0b8 100644 --- a/examples/dbus/remotecontrolledcar/car/car.pro +++ b/examples/dbus/remotecontrolledcar/car/car.pro @@ -4,6 +4,8 @@ DBUS_ADAPTORS += car.xml HEADERS += car.h SOURCES += car.cpp main.cpp +CONFIG += no_batch # work around QTBUG-96513 + # install target.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar/car INSTALLS += target