From 96d74313fe722ed55f67a89633033ed49c3dc3a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 4 Nov 2013 13:39:11 +0100 Subject: Add missing Q_INIT_RESOURCE The library needs to do Q_INIT_RESOURCE for all resources it uses internally, otherwise static linking will fail, and the user has no idea how to rectify it as the name of the missing resource is not known. The Q_INIT_RESOURCE needs to happen outside of any namespace, hence the use of static initResources() functions. Change-Id: I8f7d36b440b05809d97dd489cf8789f345633cec Reviewed-by: Thiago Macieira --- src/corelib/mimetypes/qmimeprovider.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/corelib/mimetypes') diff --git a/src/corelib/mimetypes/qmimeprovider.cpp b/src/corelib/mimetypes/qmimeprovider.cpp index aa03395f94..bdea75a3b9 100644 --- a/src/corelib/mimetypes/qmimeprovider.cpp +++ b/src/corelib/mimetypes/qmimeprovider.cpp @@ -53,6 +53,11 @@ #include #include +static void initResources() +{ + Q_INIT_RESOURCE(mimetypes); +} + QT_BEGIN_NAMESPACE static QString fallbackParent(const QString &mimeTypeName) @@ -704,6 +709,7 @@ void QMimeBinaryProvider::loadGenericIcon(QMimeTypePrivate &data) QMimeXMLProvider::QMimeXMLProvider(QMimeDatabasePrivate *db) : QMimeProviderBase(db), m_loaded(false) { + initResources(); } bool QMimeXMLProvider::isValid() -- cgit v1.2.3