diff options
| -rw-r--r-- | configure.json | 4 | ||||
| -rw-r--r-- | src/corelib/mimetypes/mimetypes.pri | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/configure.json b/configure.json index f33a3fc588..f56c2651ce 100644 --- a/configure.json +++ b/configure.json @@ -2514,6 +2514,10 @@ "condition": "!features.shared" } ] }, + "mimetype": { + "description": "Mimetype handling", + "output": [ "publicFeature", "feature" ] + }, "extra_features": { "comment": "### remove, once qfeatures.txt is ported to the new system", "output": [ "extraFeatures" ] 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 } |