diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-04-12 09:47:20 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-04-13 12:40:03 +0000 |
commit | eca6f5492c4f32ad4e1df25ab923401dc5980c76 (patch) | |
tree | 98900f79c0a7123d377ca83e03ab546a7ddc64cf | |
parent | f074d72c8f9354fcf941fe32a9279d9c68944456 (diff) |
Windows QPA: Move initialization of resources out of the Qt namespace
Q_INIT_RESOURCE() should not be within the Qt namespace; the
namespace is appended to the resource function.
Task-number: QTBUG-60118
Change-Id: I05203c3196ccdcffaf27658bcd7f3ec1c25f22d9
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
-rw-r--r-- | src/plugins/platforms/windows/qwindowsintegration.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp index 316f93e3ac..31062b681d 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.cpp +++ b/src/plugins/platforms/windows/qwindowsintegration.cpp @@ -88,6 +88,11 @@ #include "qwindowsopengltester.h" +static inline void initOpenGlBlacklistResources() +{ + Q_INIT_RESOURCE(openglblacklists); +} + QT_BEGIN_NAMESPACE /*! @@ -210,7 +215,7 @@ static inline unsigned parseOptions(const QStringList ¶mList, QWindowsIntegrationPrivate::QWindowsIntegrationPrivate(const QStringList ¶mList) { - Q_INIT_RESOURCE(openglblacklists); + initOpenGlBlacklistResources(); static bool dpiAwarenessSet = false; int tabletAbsoluteRange = -1; |