diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-08-26 21:19:12 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-09-15 08:24:10 +0000 |
| commit | a668c6a6b605ce516f71b9339df53699e85ad248 (patch) | |
| tree | c31efe90350cc21c37035f6b5016edfeafde7e82 /src/src.pro | |
| parent | b22471edf9ff666e87b12398460dfd6e761bc24c (diff) | |
Convert the old feature system
... to the new qmake based configuration system.
This removes the old qfeatures.txt (distributed over configure.json
files) and qfeatures.h (distributed over qconfig-<module>.h files).
qfeatures.prf is gone without replacement, as attempts to use it would
lead to followup errors anyway.
Change-Id: I1598de19db937082283a905b9592d3849d2199d0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro index 60d6a57e2a..541053eba5 100644 --- a/src/src.pro +++ b/src/src.pro @@ -134,7 +134,7 @@ src_android.subdir = $$PWD/android } } SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc -!contains(QT_DISABLED_FEATURES, regularexpression):pcre { +qtConfig(regularexpression):pcre { SUBDIRS += src_3rdparty_pcre src_corelib.depends += src_3rdparty_pcre } |