Fix two compiler warnings
Comparing singed/usigned ints. Use override keyword. Change-Id: I03d2c4359e0600360ebcfece593a3b125e5c9c53 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
parent
6f7d09677a
commit
2ed4e5d37d
@ -967,7 +967,7 @@ void tst_QGlyphRun::objectReplacementCharacter()
|
|||||||
QList<QGlyphRun> glyphRuns = layout.glyphRuns();
|
QList<QGlyphRun> glyphRuns = layout.glyphRuns();
|
||||||
QCOMPARE(glyphRuns.size(), 1);
|
QCOMPARE(glyphRuns.size(), 1);
|
||||||
QCOMPARE(glyphRuns.first().glyphIndexes().size(), 1);
|
QCOMPARE(glyphRuns.first().glyphIndexes().size(), 1);
|
||||||
QCOMPARE(glyphRuns.first().glyphIndexes().first(), 5);
|
QCOMPARE(glyphRuns.first().glyphIndexes().first(), uint(5));
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // QT_NO_RAWFONT
|
#endif // QT_NO_RAWFONT
|
||||||
|
@ -8117,7 +8117,7 @@ class Qtbug25280Server : public MiniHttpServer
|
|||||||
public:
|
public:
|
||||||
Qtbug25280Server(QByteArray qba) : MiniHttpServer(qba, false) {}
|
Qtbug25280Server(QByteArray qba) : MiniHttpServer(qba, false) {}
|
||||||
QSet<QTcpSocket*> receivedSockets;
|
QSet<QTcpSocket*> receivedSockets;
|
||||||
virtual void reply()
|
void reply() override
|
||||||
{
|
{
|
||||||
// Save sockets in a list
|
// Save sockets in a list
|
||||||
receivedSockets.insert((QTcpSocket*)sender());
|
receivedSockets.insert((QTcpSocket*)sender());
|
||||||
|
Loading…
Reference in New Issue
Block a user