summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@digia.com>2012-09-25 04:38:10 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-27 14:59:15 (GMT)
commitf95616e62d4e7558c31d4a7b96746fb58731e45a (patch)
treebe8cddcca5fe32516e12bf1ec8ec4c1976ec72a8
parent6c3275d17e3134497873b9ae10b6471656170da0 (diff)
downloadQt-f95616e62d4e7558c31d4a7b96746fb58731e45a.zip
Qt-f95616e62d4e7558c31d4a7b96746fb58731e45a.tar.gz
Qt-f95616e62d4e7558c31d4a7b96746fb58731e45a.tar.bz2
Load Mac specific resources 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: Iad538b5f1935ed1744617d6e47ae3e68aa36afac Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
-rw-r--r--src/gui/kernel/qapplication.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 0a08a35..9f5060e 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -150,7 +150,10 @@ static void initResources()
Q_INIT_RESOURCE_EXTERN(qprintdialog)
Q_INIT_RESOURCE(qprintdialog);
#endif
-
+#ifdef Q_WS_MAC
+ Q_INIT_RESOURCE_EXTERN(macresources)
+ Q_INIT_RESOURCE(macresources);
+#endif
}
QT_BEGIN_NAMESPACE