diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-25 07:21:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-25 07:21:53 +0200 |
| commit | e28e91ae99b8c3859899e04cc9370534c7c7b86d (patch) | |
| tree | cca81b1e745be4f25aab78e8e917c2324594e539 /src/corelib/mimetypes/qmimedatabase_p.h | |
| parent | 5ea233ca6782eb27adf596515cb66ef3dadc1d5e (diff) | |
| parent | ebfad73b4e44fe6db8059200da105b4b87888718 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/corelib/animation/qpropertyanimation.cpp
src/gui/image/qicon.cpp
tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
Change-Id: I3698172b7b44ebb487cb38f50fd2c4a9f8a35b21
Diffstat (limited to 'src/corelib/mimetypes/qmimedatabase_p.h')
| -rw-r--r-- | src/corelib/mimetypes/qmimedatabase_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/mimetypes/qmimedatabase_p.h b/src/corelib/mimetypes/qmimedatabase_p.h index 05267d83c5..7bc1d41c4d 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" @@ -119,5 +119,4 @@ public: QT_END_NAMESPACE -#endif // QT_NO_MIMETYPE #endif // QMIMEDATABASE_P_H |