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 | |
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')
-rw-r--r-- | src/corelib/mimetypes/qmimedatabase.cpp | 19 | ||||
-rw-r--r-- | src/corelib/mimetypes/qmimedatabase.h | 3 | ||||
-rw-r--r-- | src/corelib/mimetypes/qmimedatabase_p.h | 3 | ||||
-rw-r--r-- | src/corelib/mimetypes/qmimeglobpattern.cpp | 4 | ||||
-rw-r--r-- | src/corelib/mimetypes/qmimeglobpattern_p.h | 3 | ||||
-rw-r--r-- | src/corelib/mimetypes/qmimemagicrule.cpp | 4 | ||||
-rw-r--r-- | src/corelib/mimetypes/qmimemagicrule_p.h | 3 | ||||
-rw-r--r-- | src/corelib/mimetypes/qmimemagicrulematcher.cpp | 3 | ||||
-rw-r--r-- | src/corelib/mimetypes/qmimemagicrulematcher_p.h | 3 | ||||
-rw-r--r-- | src/corelib/mimetypes/qmimeprovider.cpp | 4 | ||||
-rw-r--r-- | src/corelib/mimetypes/qmimeprovider_p.h | 3 | ||||
-rw-r--r-- | src/corelib/mimetypes/qmimetype.cpp | 4 | ||||
-rw-r--r-- | src/corelib/mimetypes/qmimetype.h | 3 | ||||
-rw-r--r-- | src/corelib/mimetypes/qmimetype_p.h | 3 | ||||
-rw-r--r-- | src/corelib/mimetypes/qmimetypeparser.cpp | 4 | ||||
-rw-r--r-- | src/corelib/mimetypes/qmimetypeparser_p.h | 3 |
16 files changed, 11 insertions, 58 deletions
diff --git a/src/corelib/mimetypes/qmimedatabase.cpp b/src/corelib/mimetypes/qmimedatabase.cpp index a2e99f3816..50b30a1832 100644 --- a/src/corelib/mimetypes/qmimedatabase.cpp +++ b/src/corelib/mimetypes/qmimedatabase.cpp @@ -40,8 +40,6 @@ #include <qplatformdefs.h> // always first -#ifndef QT_NO_MIMETYPE - #include "qmimedatabase.h" #include "qmimedatabase_p.h" @@ -443,25 +441,14 @@ bool QMimeDatabasePrivate::inherits(const QString &mime, const QString &parent) Applications which want to define custom MIME types need to install an XML file into the locations searched for MIME definitions. These locations can be queried with - \code - QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QLatin1String("mime/packages"), - QStandardPaths::LocateDirectory); - \endcode + \snippet code/src_corelib_mimetype_qmimedatabase.cpp 1 On a typical Unix system, this will be /usr/share/mime/packages/, but it is also possible to extend the list of directories by setting the environment variable \c XDG_DATA_DIRS. For instance adding /opt/myapp/share to \c XDG_DATA_DIRS will result in /opt/myapp/share/mime/packages/ being searched for MIME definitions. Here is an example of MIME XML: - \code - <?xml version="1.0" encoding="UTF-8"?> - <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> - <mime-type type="application/vnd.qt.qmakeprofile"> - <comment xml:lang="en">Qt qmake Profile</comment> - <glob pattern="*.pro" weight="50"/> - </mime-type> - </mime-info> - \endcode + \snippet code/src_corelib_mimetype_qmimedatabase.cpp 2 For more details about the syntax of XML MIME definitions, including defining "magic" in order to detect MIME types based on data as well, read the @@ -798,5 +785,3 @@ QList<QMimeType> QMimeDatabase::allMimeTypes() const */ QT_END_NAMESPACE - -#endif // QT_NO_MIMETYPE diff --git a/src/corelib/mimetypes/qmimedatabase.h b/src/corelib/mimetypes/qmimedatabase.h index 358f0ab779..9111e5a04c 100644 --- a/src/corelib/mimetypes/qmimedatabase.h +++ b/src/corelib/mimetypes/qmimedatabase.h @@ -43,7 +43,7 @@ #include <QtCore/qmimetype.h> -#ifndef QT_NO_MIMETYPE +QT_REQUIRE_CONFIG(mimetype); #include <QtCore/qstringlist.h> @@ -92,5 +92,4 @@ private: QT_END_NAMESPACE -#endif // QT_NO_MIMETYPE #endif // QMIMEDATABASE_H 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 diff --git a/src/corelib/mimetypes/qmimeglobpattern.cpp b/src/corelib/mimetypes/qmimeglobpattern.cpp index e7b2b879a1..cd42b4da83 100644 --- a/src/corelib/mimetypes/qmimeglobpattern.cpp +++ b/src/corelib/mimetypes/qmimeglobpattern.cpp @@ -39,8 +39,6 @@ #include "qmimeglobpattern_p.h" -#ifndef QT_NO_MIMETYPE - #include <QRegExp> #include <QStringList> #include <QDebug> @@ -239,5 +237,3 @@ void QMimeAllGlobPatterns::clear() } QT_END_NAMESPACE - -#endif // QT_NO_MIMETYPE diff --git a/src/corelib/mimetypes/qmimeglobpattern_p.h b/src/corelib/mimetypes/qmimeglobpattern_p.h index 103729c4ff..bb6f64320b 100644 --- a/src/corelib/mimetypes/qmimeglobpattern_p.h +++ b/src/corelib/mimetypes/qmimeglobpattern_p.h @@ -53,7 +53,7 @@ #include <QtCore/private/qglobal_p.h> -#ifndef QT_NO_MIMETYPE +QT_REQUIRE_CONFIG(mimetype); #include <QtCore/qstringlist.h> #include <QtCore/qhash.h> @@ -162,5 +162,4 @@ public: QT_END_NAMESPACE -#endif // QT_NO_MIMETYPE #endif // QMIMEGLOBPATTERN_P_H diff --git a/src/corelib/mimetypes/qmimemagicrule.cpp b/src/corelib/mimetypes/qmimemagicrule.cpp index 9dadebc999..a97fe5bdc4 100644 --- a/src/corelib/mimetypes/qmimemagicrule.cpp +++ b/src/corelib/mimetypes/qmimemagicrule.cpp @@ -42,8 +42,6 @@ #include "qmimemagicrule_p.h" -#ifndef QT_NO_MIMETYPE - #include "qmimetypeparser_p.h" #include <QtCore/QList> #include <QtCore/QDebug> @@ -364,5 +362,3 @@ bool QMimeMagicRule::matches(const QByteArray &data) const } QT_END_NAMESPACE - -#endif // QT_NO_MIMETYPE diff --git a/src/corelib/mimetypes/qmimemagicrule_p.h b/src/corelib/mimetypes/qmimemagicrule_p.h index 9b27ef2657..6962a6ca59 100644 --- a/src/corelib/mimetypes/qmimemagicrule_p.h +++ b/src/corelib/mimetypes/qmimemagicrule_p.h @@ -53,7 +53,7 @@ #include <QtCore/private/qglobal_p.h> -#ifndef QT_NO_MIMETYPE +QT_REQUIRE_CONFIG(mimetype); #include <QtCore/qbytearray.h> #include <QtCore/qscopedpointer.h> @@ -125,5 +125,4 @@ Q_DECLARE_SHARED(QMimeMagicRule) QT_END_NAMESPACE -#endif // QT_NO_MIMETYPE #endif // QMIMEMAGICRULE_H diff --git a/src/corelib/mimetypes/qmimemagicrulematcher.cpp b/src/corelib/mimetypes/qmimemagicrulematcher.cpp index b5194d3543..8f44fd2f80 100644 --- a/src/corelib/mimetypes/qmimemagicrulematcher.cpp +++ b/src/corelib/mimetypes/qmimemagicrulematcher.cpp @@ -41,8 +41,6 @@ #include "qmimemagicrulematcher_p.h" -#ifndef QT_NO_MIMETYPE - #include "qmimetype_p.h" QT_BEGIN_NAMESPACE @@ -106,4 +104,3 @@ unsigned QMimeMagicRuleMatcher::priority() const } QT_END_NAMESPACE -#endif // QT_NO_MIMETYPE diff --git a/src/corelib/mimetypes/qmimemagicrulematcher_p.h b/src/corelib/mimetypes/qmimemagicrulematcher_p.h index 5e3d5306c0..5e74e2e3fc 100644 --- a/src/corelib/mimetypes/qmimemagicrulematcher_p.h +++ b/src/corelib/mimetypes/qmimemagicrulematcher_p.h @@ -53,7 +53,7 @@ #include "qmimemagicrule_p.h" -#ifndef QT_NO_MIMETYPE +QT_REQUIRE_CONFIG(mimetype); #include <QtCore/qbytearray.h> #include <QtCore/qlist.h> @@ -94,5 +94,4 @@ Q_DECLARE_SHARED(QMimeMagicRuleMatcher) QT_END_NAMESPACE -#endif // QT_NO_MIMETYPE #endif // QMIMEMAGICRULEMATCHER_P_H diff --git a/src/corelib/mimetypes/qmimeprovider.cpp b/src/corelib/mimetypes/qmimeprovider.cpp index 90a16886a9..c4a8458243 100644 --- a/src/corelib/mimetypes/qmimeprovider.cpp +++ b/src/corelib/mimetypes/qmimeprovider.cpp @@ -40,8 +40,6 @@ #include "qmimeprovider_p.h" -#ifndef QT_NO_MIMETYPE - #include "qmimetypeparser_p.h" #include <qstandardpaths.h> #include "qmimemagicrulematcher_p.h" @@ -757,5 +755,3 @@ void QMimeXMLProvider::addMagicMatcher(const QMimeMagicRuleMatcher &matcher) } QT_END_NAMESPACE - -#endif // QT_NO_MIMETYPE diff --git a/src/corelib/mimetypes/qmimeprovider_p.h b/src/corelib/mimetypes/qmimeprovider_p.h index 97504fe99a..b6268210c0 100644 --- a/src/corelib/mimetypes/qmimeprovider_p.h +++ b/src/corelib/mimetypes/qmimeprovider_p.h @@ -54,7 +54,7 @@ #include "qmimedatabase_p.h" -#ifndef QT_NO_MIMETYPE +QT_REQUIRE_CONFIG(mimetype); #include "qmimeglobpattern_p.h" #include <QtCore/qdatetime.h> @@ -173,5 +173,4 @@ private: QT_END_NAMESPACE -#endif // QT_NO_MIMETYPE #endif // QMIMEPROVIDER_P_H diff --git a/src/corelib/mimetypes/qmimetype.cpp b/src/corelib/mimetypes/qmimetype.cpp index d7590ecf1f..50b8eae5c3 100644 --- a/src/corelib/mimetypes/qmimetype.cpp +++ b/src/corelib/mimetypes/qmimetype.cpp @@ -40,8 +40,6 @@ #include "qmimetype.h" -#ifndef QT_NO_MIMETYPE - #include "qmimetype_p.h" #include "qmimedatabase_p.h" #include "qmimeprovider_p.h" @@ -526,5 +524,3 @@ QDebug operator<<(QDebug debug, const QMimeType &mime) #endif QT_END_NAMESPACE - -#endif // QT_NO_MIMETYPE diff --git a/src/corelib/mimetypes/qmimetype.h b/src/corelib/mimetypes/qmimetype.h index def4034f8a..8287f1434b 100644 --- a/src/corelib/mimetypes/qmimetype.h +++ b/src/corelib/mimetypes/qmimetype.h @@ -43,7 +43,7 @@ #include <QtCore/qglobal.h> -#ifndef QT_NO_MIMETYPE +QT_REQUIRE_CONFIG(mimetype); #include <QtCore/qobjectdefs.h> #include <QtCore/qshareddata.h> @@ -135,5 +135,4 @@ Q_CORE_EXPORT QDebug operator<<(QDebug debug, const QMimeType &mime); QT_END_NAMESPACE -#endif // QT_NO_MIMETYPE #endif // QMIMETYPE_H diff --git a/src/corelib/mimetypes/qmimetype_p.h b/src/corelib/mimetypes/qmimetype_p.h index aa38a1adf5..5a36e6613c 100644 --- a/src/corelib/mimetypes/qmimetype_p.h +++ b/src/corelib/mimetypes/qmimetype_p.h @@ -54,7 +54,7 @@ #include <QtCore/private/qglobal_p.h> #include "qmimetype.h" -#ifndef QT_NO_MIMETYPE +QT_REQUIRE_CONFIG(mimetype); #include <QtCore/qhash.h> #include <QtCore/qstringlist.h> @@ -124,5 +124,4 @@ QT_END_NAMESPACE QT_END_NAMESPACE #endif -#endif // QT_NO_MIMETYPE #endif // QMIMETYPE_P_H diff --git a/src/corelib/mimetypes/qmimetypeparser.cpp b/src/corelib/mimetypes/qmimetypeparser.cpp index 0a55560ab0..7ff695bbc3 100644 --- a/src/corelib/mimetypes/qmimetypeparser.cpp +++ b/src/corelib/mimetypes/qmimetypeparser.cpp @@ -41,8 +41,6 @@ #include "qmimetypeparser_p.h" -#ifndef QT_NO_MIMETYPE - #include "qmimetype_p.h" #include "qmimemagicrulematcher_p.h" @@ -341,5 +339,3 @@ bool QMimeTypeParserBase::parse(QIODevice *dev, const QString &fileName, QString } QT_END_NAMESPACE - -#endif // QT_NO_MIMETYPE diff --git a/src/corelib/mimetypes/qmimetypeparser_p.h b/src/corelib/mimetypes/qmimetypeparser_p.h index 0ce39e701c..6e3f5fd556 100644 --- a/src/corelib/mimetypes/qmimetypeparser_p.h +++ b/src/corelib/mimetypes/qmimetypeparser_p.h @@ -54,7 +54,7 @@ #include "qmimedatabase_p.h" -#ifndef QT_NO_MIMETYPE +QT_REQUIRE_CONFIG(mimetype); #include "qmimeprovider_p.h" @@ -129,5 +129,4 @@ private: QT_END_NAMESPACE -#endif // QT_NO_MIMETYPE #endif // MIMETYPEPARSER_P_H |