Skip to content

Commit

Permalink
qmake: ignore QT if we have failed requires()
Browse files Browse the repository at this point in the history
otherwise the project would need to clear QT despite using
qtHaveModule() in requires() (or REQUIRES=).

Task-number: QTBUG-65106
Change-Id: I568202214c8eafcdbe2d0e253b18f0e171293aff
Reviewed-by: Joerg Bornemann <[email protected]>
  • Loading branch information
ossilator committed Jan 12, 2018
1 parent 2aa9908 commit ab4cc83
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions mkspecs/features/qt.prf
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# This avoids spurious errors when a project is explicitly disabled
# due to required Qt modules being missing.
!isEmpty(QMAKE_FAILED_REQUIREMENTS): return()

CONFIG *= thread

#handle defines
Expand Down

0 comments on commit ab4cc83

Please sign in to comment.