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

Fix Qt6 builds after dev -> wip/qt6 merge 

Change-Id: I56b9d3abdbc6663a2d514f12aa20f2f574042bc1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Alexandru Croitor 2019-07-08 13:01:56 +02:00
parent 19138e6d99
commit c0987d3923
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/imports/qtquick2/plugin.cpp
View File

@ -38,6 +38,7 @@
****************************************************************************/ ****************************************************************************/
#include <QtQml/qqmlextensionplugin.h> #include <QtQml/qqmlextensionplugin.h>
#include <QtQml/QQmlEngine>
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <QtQml/private/qqmlengine_p.h> #include <QtQml/private/qqmlengine_p.h>

2
src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
View File

@ -2329,7 +2329,7 @@ void Renderer::uploadBatch(Batch *b)
iDump << " -- Index Data, count:" << b->indexCount; iDump << " -- Index Data, count:" << b->indexCount;
for (int i=0; i<b->indexCount; ++i) { for (int i=0; i<b->indexCount; ++i) {
if ((i % 24) == 0) if ((i % 24) == 0)
iDump << endl << " --- "; iDump << Qt::endl << " --- ";
iDump << id[i]; iDump << id[i];
} }
} }

2
tests/auto/quick/rendernode/tst_rendernode.cpp
View File

@ -195,7 +195,7 @@ static bool fuzzyCompareColor(QRgb x, QRgb y, QByteArray *errorMessage)
enum { fuzz = 4 }; enum { fuzz = 4 };
if (qAbs(qRed(x) - qRed(y)) >= fuzz || qAbs(qGreen(x) - qGreen(y)) >= fuzz || qAbs(qBlue(x) - qBlue(y)) >= fuzz) { if (qAbs(qRed(x) - qRed(y)) >= fuzz || qAbs(qGreen(x) - qGreen(y)) >= fuzz || qAbs(qBlue(x) - qBlue(y)) >= fuzz) {
QString s; QString s;
QDebug(&s).nospace() << hex << "Color mismatch 0x" << x << " 0x" << y << dec << " (fuzz=" << fuzz << ")."; QDebug(&s).nospace() << Qt::hex << "Color mismatch 0x" << x << " 0x" << y << Qt::dec << " (fuzz=" << fuzz << ").";
*errorMessage = s.toLocal8Bit(); *errorMessage = s.toLocal8Bit();
return false; return false;
} }

2
tests/auto/quick/shared/visualtestutil.cpp
View File

@ -95,7 +95,7 @@ bool QQuickVisualTestUtil::compareImages(const QImage &ia, const QImage &ib, QSt
|| qAbs(qRed(a) - qRed(b)) > tolerance || qAbs(qRed(a) - qRed(b)) > tolerance
|| qAbs(qRed(a) - qRed(b)) > tolerance) { || qAbs(qRed(a) - qRed(b)) > tolerance) {
QDebug(errorMessage) << "Mismatch at:" << x << y << ':' QDebug(errorMessage) << "Mismatch at:" << x << y << ':'
<< hex << showbase << a << b; << Qt::hex << Qt::showbase << a << b;
return false; return false;
} }
} }