qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build with latest qtbase 

Make sure to include the private parts of qnativeinterface.h,
that got moved to qnativeinterface_p.h in commit b99adf7a810
(qtbase).

Pick-to: 6.2
Change-Id: I92a295cfa0421b914aba504ab37f6d1bf826e1b6
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Kai Köhne 2021-11-15 14:38:53 +01:00 committed by Edward Welbourne
parent 1e9a296d22
commit 398279e364
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/quick/scenegraph/coreapi/qsgtexture.cpp
View File

@ -43,6 +43,7 @@
#include <private/qsgmaterialshader_p.h>
#include <private/qquickitem_p.h> // qquickwindow_p.h cannot be included on its own due to template nonsense
#include <private/qquickwindow_p.h>
#include <QtCore/private/qnativeinterface_p.h>
#include <QtGui/private/qrhi_p.h>
#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) && defined(__GLIBC__)

1
src/quick/scenegraph/coreapi/qsgtexture_mac.mm
View File

@ -41,6 +41,7 @@
#include "qsgtexture_platform.h"
#include <private/qquickitem_p.h>
#include <private/qquickwindow_p.h>
#include <QtCore/private/qnativeinterface_p.h>
#include <QtGui/private/qrhi_p.h>
QT_BEGIN_NAMESPACE