diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-20 11:19:14 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-20 12:31:27 +0200 |
| commit | 7950b6b283549c98f1e0f981c84b68071a13b616 (patch) | |
| tree | cf7281872045ebd57c68e10064ff0f400084aa13 /src/plugins/platforms/windows/qwindowsintegration.cpp | |
| parent | 58d2927861d3e57cac4f6db599e209d2bfb17a2c (diff) | |
| parent | 0794d61c822585530243f638687b8a75f0a15d0c (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/corelib/tools/qbytearray.h
src/corelib/tools/qdatetime.h
src/corelib/tools/qstring.h
src/corelib/tools/qversionnumber.h
src/plugins/platforms/android/qandroidplatformintegration.cpp
tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp
Change-Id: Iefd92a435e687a76cd593099e40d9a9620a1454d
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsintegration.cpp')
| -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 6614c76a53..a049b8c40c 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; |