diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-15 19:47:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-15 19:47:57 +0200 |
| commit | 40a1f69e8663fb79560c26cfad5ead45b1b3ee5f (patch) | |
| tree | a8ceb093a098a38b29c0fe27e41af480ae10b876 /mkspecs/features/qfeatures.prf | |
| parent | 446afc10451d5097d7bd20b1b8d20325c4d54fa5 (diff) | |
| parent | 6b2071c697d4c48f0cd289b28b443ebffc3432e6 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
configure.json
mkspecs/macx-tvos-clang/qmake.conf
mkspecs/macx-watchos-clang/qmake.conf
Change-Id: Iaf32339ace59dff9ed344972472744c55d75025c
Diffstat (limited to 'mkspecs/features/qfeatures.prf')
| -rw-r--r-- | mkspecs/features/qfeatures.prf | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mkspecs/features/qfeatures.prf b/mkspecs/features/qfeatures.prf deleted file mode 100644 index 15ef5c5be0..0000000000 --- a/mkspecs/features/qfeatures.prf +++ /dev/null @@ -1,4 +0,0 @@ -# This file needs to be loaded explicitly, as the evaluation is relatively -# expensive, and not many projects will actually need it. -QMAKE_QT_FEATURES = $$[QT_HOST_DATA/get]/mkspecs/qfeatures.pri -include($$QMAKE_QT_FEATURES) | error("Failed to load $$QMAKE_QT_FEATURES") |