diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-08-10 14:33:01 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-08-19 04:28:21 +0000 |
| commit | 0a070d1e957a0a25bf401b10663dc3fbd7d55e27 (patch) | |
| tree | accbfb14905faa01c95e625f156d5d287ad044dd /src/corelib | |
| parent | cf166e58398779590e39f3a2635d953c6b53bd4b (diff) | |
Don't use QT_NO_MIMETYPE in mimetypes.pri
Instead define a proper feature for it and use qtConfig().
Change-Id: I64b1d26b2419a24d3239e9935341b7d535990dfb
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/mimetypes/mimetypes.pri | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/mimetypes/mimetypes.pri b/src/corelib/mimetypes/mimetypes.pri index 1ab773fc10..870b6c65a5 100644 --- a/src/corelib/mimetypes/mimetypes.pri +++ b/src/corelib/mimetypes/mimetypes.pri @@ -1,6 +1,7 @@ # Qt core mimetype module -HEADERS += \ +qtConfig(mimetype) { + HEADERS += \ mimetypes/qmimedatabase.h \ mimetypes/qmimetype.h \ mimetypes/qmimemagicrulematcher_p.h \ @@ -11,7 +12,7 @@ HEADERS += \ mimetypes/qmimeglobpattern_p.h \ mimetypes/qmimeprovider_p.h -SOURCES += \ + SOURCES += \ mimetypes/qmimedatabase.cpp \ mimetypes/qmimetype.cpp \ mimetypes/qmimemagicrulematcher.cpp \ @@ -20,6 +21,5 @@ SOURCES += \ mimetypes/qmimeglobpattern.cpp \ mimetypes/qmimeprovider.cpp -!contains(DEFINES, QT_NO_MIMETYPE) { RESOURCES += mimetypes/mimetypes.qrc } |