diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2012-08-27 14:03:47 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-20 07:01:42 +0200 |
| commit | 7432bb6bfbda1fcaa3b363b58b0339c780b66483 (patch) | |
| tree | f1868144317cbf6727fb473da1754365569e78bd | |
| parent | c0bfb3d9b705c3c30ae3c4e6e41fdea8fd949e28 (diff) | |
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>
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaintegration.mm | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm index dfb115116e..81d20e93e5 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); |