Skip to content

Commit

Permalink
Fix build with -no-compile-examples
Browse files Browse the repository at this point in the history
configure -no-compile-examples means that the examples won't be
compiled, but processed by qmake to generate install targets. So we
shouldn't do any substitution (like it is done for CMake targets), or
extra compilers / copies (like it is done for qmltypes).

Also install the qmldir files that some qml examples need.

Fixes: QTBUG-83375
Fixes: QTBUG-83704
Change-Id: I6a9393bd914d98a5d85f4089205510e49a435842
Reviewed-by: Joerg Bornemann <[email protected]>
Reviewed-by: Thiago Macieira <[email protected]>
  • Loading branch information
kkoehne committed Apr 23, 2020
1 parent 10acfec commit 1e4801c
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions mkspecs/features/qt_example_installs.prf
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ sourcefiles += \
extras = \
$$_PRO_FILE_PWD_/README \
$$_PRO_FILE_PWD_/README.TXT \
$$_PRO_FILE_PWD_/qmldir \
$$files($$_PRO_FILE_PWD_/*.pri) \
$$replace(_PRO_FILE_, \\.pro$, .qmlproject) \
$$replace(_PRO_FILE_, \\.pro$, .json) \
Expand Down Expand Up @@ -140,6 +141,9 @@ equals(TEMPLATE, app)|equals(TEMPLATE, lib) {
SOURCES =
OBJECTIVE_SOURCES =
INSTALLS -= target
QMAKE_SUBSTITUTES =
QMAKE_EXTRA_COMPILERS =
COPIES =
} else {
CONFIG += relative_qt_rpath # Examples built as part of Qt should be relocatable
}

0 comments on commit 1e4801c

Please sign in to comment.