From 3eebadc1734463afa469dcd08eab8c5d2557dec6 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Fri, 28 Sep 2018 11:40:10 +0200
Subject: Modernize the "mimetype" feature

Change-Id: I9b67c2cbc0891a38ece18d521c86fbc7344dce7a
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/corelib/mimetypes/qmimedatabase_p.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/corelib/mimetypes/qmimedatabase_p.h')

diff --git a/src/corelib/mimetypes/qmimedatabase_p.h b/src/corelib/mimetypes/qmimedatabase_p.h
index 1c38f46115..1e605d9a24 100644
--- a/src/corelib/mimetypes/qmimedatabase_p.h
+++ b/src/corelib/mimetypes/qmimedatabase_p.h
@@ -54,7 +54,7 @@
 
 #include "qmimetype.h"
 
-#ifndef QT_NO_MIMETYPE
+QT_REQUIRE_CONFIG(mimetype);
 
 #include "qmimetype_p.h"
 #include "qmimeglobpattern_p.h"
@@ -116,5 +116,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_MIMETYPE
 #endif // QMIMEDATABASE_P_H
-- 
cgit v1.2.3