From fb656c036db0549180073e133773862d08f6cd24 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 10 Sep 2021 13:51:07 +0200 Subject: Remove .qmake.conf from this repository This file was necessary for the qmake build and the CI. The qmake build is history, and the CI does now read .cmake.conf (see QTQAINFRA-4392). In addition to being superfluous, the existence of .qmake.conf triggers QTBUG-76140 when building Qt examples with qmake. Removing the file alleviates the symptoms of this bug. "Interestingly", to make the qmake build of examples work in the CI, we have to adjust the dbus examples to not use nmake inference rules. The absence of .qmake.conf results in a different order of inference rules in the Makefile, and nmake/jom pick up generated source files from the source dir. These are incompatible with the correct generated source files in the build dir. See QTBUG-96513 for details. Fixes: QTBUG-92271 Task-number: QTBUG-96513 Change-Id: I4076fae2eeb993956b54aced2c9c844ae2577a4a Reviewed-by: Qt CI Bot Reviewed-by: Alexandru Croitor --- examples/dbus/chat/chat.pro | 2 ++ 1 file changed, 2 insertions(+) (limited to 'examples/dbus/chat/chat.pro') diff --git a/examples/dbus/chat/chat.pro b/examples/dbus/chat/chat.pro index 631a876954..93d3178177 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 -- cgit v1.2.3