diff options
| author | David Faure <faure@kde.org> | 2012-02-07 19:46:12 +0100 |
|---|---|---|
| committer | Wolf-Michael Bolle <wolf-michael.bolle@nokia.com> | 2012-02-10 09:45:36 +0100 |
| commit | d71f43b6c75fe114734101b3920a8e6d972c7f71 (patch) | |
| tree | 453587cad88f844910276a390a44be31c3526968 | |
| parent | e77ec287cdb4bddcf1e2c69e88a124ee14251277 (diff) | |
Don't export QMimeMagicRuleMatcher.
QMimeTypePrivate still has to be exported, due to QMIMETYPE_BUILDER used
in autotests.
Change-Id: Ibcd4976b2f18fbaa4f2532ed45a03a0bfeaf2694
Reviewed-by: Wolf-Michael Bolle <wolf-michael.bolle@nokia.com>
| -rw-r--r-- | src/imports/mimetypes/qdeclarativemimetype.cpp | 4 | ||||
| -rw-r--r-- | src/mimetypes/qmimemagicrulematcher_p.h | 2 | ||||
| -rw-r--r-- | tests/auto/qmimetype/tst_qmimetype.cpp | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/src/imports/mimetypes/qdeclarativemimetype.cpp b/src/imports/mimetypes/qdeclarativemimetype.cpp index aba0686..24dbe59 100644 --- a/src/imports/mimetypes/qdeclarativemimetype.cpp +++ b/src/imports/mimetypes/qdeclarativemimetype.cpp @@ -41,8 +41,6 @@ #include "qdeclarativemimetype_p.h" // Basis -#include "qmimemagicrulematcher_p.h" - #include <QtCore/QDebug> #include <qmimetype_p.h> @@ -299,7 +297,7 @@ QVariantMap QDeclarativeMimeType::properties() const */ void QDeclarativeMimeType::assignProperties(const QVariantMap &other) { - m_MimeType = QMimeType(QMimeTypePrivate()); + m_MimeType = QMimeType(); ASSIGN_FROM_PROPERTY(name, setName, String, toString) //ASSIGN_FROM_PROPERTY(aliases, setAliases, List, toList) //ASSIGN_FROM_PROPERTY(comment, setComment, String, toString) diff --git a/src/mimetypes/qmimemagicrulematcher_p.h b/src/mimetypes/qmimemagicrulematcher_p.h index a706210..cdca9e7 100644 --- a/src/mimetypes/qmimemagicrulematcher_p.h +++ b/src/mimetypes/qmimemagicrulematcher_p.h @@ -33,7 +33,7 @@ QT_BEGIN_NAMESPACE -class QMIME_EXPORT QMimeMagicRuleMatcher +class QMimeMagicRuleMatcher { public: explicit QMimeMagicRuleMatcher(const QString &mime, unsigned priority = 65535); diff --git a/tests/auto/qmimetype/tst_qmimetype.cpp b/tests/auto/qmimetype/tst_qmimetype.cpp index d2e5eb6..c239d1b 100644 --- a/tests/auto/qmimetype/tst_qmimetype.cpp +++ b/tests/auto/qmimetype/tst_qmimetype.cpp @@ -41,7 +41,6 @@ #include "tst_qmimetype.h" -#include <qmimemagicrulematcher_p.h> #include <qmimetype_p.h> #include <qmimetype.h> |