diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:34:43 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:36:19 +0100 |
| commit | 65a97fccc67ae7f3df1900e1419955f939a49b9f (patch) | |
| tree | a8fd0e119b585123e77e3b2574f2d82a5474eb28 /mkspecs | |
| parent | 5e8bc07cb2ded1f5f74435411de666f419869514 (diff) | |
| parent | 1303327a713d8f88fd9782e4f887b646d4210f68 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
Change-Id: If089d5010d15c33b3c1f13912d4386207456c1a9
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt.prf | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 3ccbbe7061..b57afcf72d 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -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 |