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>
bb10
Lars Knoll 2016-08-10 14:33:01 +02:00
parent cf166e5839
commit 0a070d1e95
2 changed files with 7 additions and 3 deletions

View File

@ -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" ]

View File

@ -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
}