From: Andy Shaw <andy.shaw@digia.com>
Date: Mon, 27 Aug 2012 12:03:47 +0000 (+0200)
Subject: Load Mac specific resources when used in a static build
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7432bb6bfbda1fcaa3b363b58b0339c780b66483;p=profile%2Fivi%2Fqtbase.git

Load Mac specific resources when used in a static build

When Qt was built statically then the Mac specific resources were not
being loaded which meant some style specific images were not used.

Task-number: QTBUG-25391
Change-Id: If311148df19a87b6c8104553b662e3bf157f5717
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
---

diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index dfb1151..81d20e9 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -59,6 +59,12 @@
 
 #include <QtPlatformSupport/private/qcoretextfontdatabase_p.h>
 
+static void initResources()
+{
+    Q_INIT_RESOURCE_EXTERN(qcocoaresources)
+    Q_INIT_RESOURCE(qcocoaresources);
+}
+
 QT_BEGIN_NAMESPACE
 
 QCocoaScreen::QCocoaScreen(int screenIndex)
@@ -159,6 +165,7 @@ QCocoaIntegration::QCocoaIntegration()
     , mNativeInterface(new QCocoaNativeInterface)
     , mServices(new QCocoaServices)
 {
+    initResources();
     QCocoaAutoReleasePool pool;
 
     qApp->setAttribute(Qt::AA_DontUseNativeMenuBar, false);