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 <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2021-09-10 13:51:07 +02:00
parent 3714e51436
commit fb656c036d
3 changed files with 4 additions and 9 deletions

View File

@ -1,9 +0,0 @@
load(qt_build_config)
CONFIG += warning_clean
DEFINES += QT_NO_JAVA_STYLE_ITERATORS
QT_SOURCE_TREE = $$PWD
QT_BUILD_TREE = $$shadowed($$PWD)
MODULE_VERSION = 6.3.0

View File

@ -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

View File

@ -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