1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows QPA: Move initialization of resources out of the Qt namespace

Browse Source 
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>
This commit is contained in:
Friedemann Kleint 2017-04-12 09:47:20 +02:00
parent f074d72c8f
commit eca6f5492c
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/platforms/windows/qwindowsintegration.cpp
View File

@ -88,6 +88,11 @@
#include "qwindowsopengltester.h" #include "qwindowsopengltester.h"
static inline void initOpenGlBlacklistResources()
{
Q_INIT_RESOURCE(openglblacklists);
}
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
/*! /*!
@ -210,7 +215,7 @@ static inline unsigned parseOptions(const QStringList &paramList,
QWindowsIntegrationPrivate::QWindowsIntegrationPrivate(const QStringList &paramList) QWindowsIntegrationPrivate::QWindowsIntegrationPrivate(const QStringList &paramList)
{ {
Q_INIT_RESOURCE(openglblacklists); initOpenGlBlacklistResources();
static bool dpiAwarenessSet = false; static bool dpiAwarenessSet = false;
int tabletAbsoluteRange = -1; int tabletAbsoluteRange = -1;