AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

Browse Source 
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Tests: Fix some compile warnings.
This commit is contained in:
Qt Continuous Integration System 2011-05-20 00:23:38 +10:00
commit 348f5f40d8
40 changed files with 76 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/modeltest/modeltest.cpp
View File

@ -470,7 +470,7 @@ void ModelTest::data()
\sa rowsInserted()
*/
void ModelTest::rowsAboutToBeInserted ( const QModelIndex &parent, int start, int end )
void ModelTest::rowsAboutToBeInserted ( const QModelIndex &parent, int start, int /* end */)
{
// Q_UNUSED(end);
// qDebug() << "rowsAboutToBeInserted" << "start=" << start << "end=" << end << "parent=" << model->data ( parent ).toString()

2
tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp
View File

@ -299,7 +299,7 @@ public:
startTimer(2000);
}
void timerEvent(QTimerEvent *event)
void timerEvent(QTimerEvent * /* event */)
{
// should not crash.
(void)new QScrollArea(this);

2
tests/auto/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp
View File

@ -90,7 +90,7 @@ public:
QSizeF documentSize() const { return QSizeF(); }
QRectF frameBoundingRect(QTextFrame *) const { return QRectF(); }
QRectF blockBoundingRect(const QTextBlock &) const { return QRectF(); }
void documentChanged(int from, int oldLength, int length) {
void documentChanged(int from, int /* oldLength */, int length) {
++changeEvents;
QTextBlock last = document()->lastBlock();

1
tests/auto/qapplication/modal/main.cpp
View File

@ -49,5 +49,6 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
QApplication::setAttribute(Qt::AA_NativeWindows); //QTBUG-15774
base *b = new base();
Q_UNUSED(b);
return app.exec();
}

2
tests/auto/qcssparser/tst_qcssparser.cpp
View File

@ -148,7 +148,7 @@ void tst_QCssParser::scanner_data()
}
static char *tokenName(QCss::TokenType t)
static const char *tokenName(QCss::TokenType t)
{
switch (t) {
case QCss::NONE: return "NONE";

1
tests/auto/qdir/tst_qdir.cpp
View File

@ -974,6 +974,7 @@ void tst_QDir::cd()
QDir d = startDir;
bool notUsed = d.exists(); // make sure we cache this before so we can see if 'cd' fails to flush this
Q_UNUSED(notUsed);
QCOMPARE(d.cd(cdDir), successExpected);
if (successExpected)
QCOMPARE(d.absolutePath(), newDir);

2
tests/auto/qfile/tst_qfile.cpp
View File

@ -333,6 +333,8 @@ private:
case OpenRFile:
return openRFile(file, mode, handleFlags);
#endif
case NumberOfFileTypes:
break;
}
return false;

1
tests/auto/qfuture/tst_qfuture.cpp
View File

@ -1453,6 +1453,7 @@ void tst_QFuture::exceptions_QTBUG18149()
try {
MyClass m;
Q_UNUSED(m);
throw 0;
} catch (int) {}

3
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
View File

@ -110,7 +110,7 @@ static void sendMousePress(QGraphicsScene *scene, const QPointF &point, Qt::Mous
}
static void sendMouseMove(QGraphicsScene *scene, const QPointF &point,
Qt::MouseButton button = Qt::NoButton, Qt::MouseButtons buttons = 0)
Qt::MouseButton button = Qt::NoButton, Qt::MouseButtons /* buttons */ = 0)
{
QGraphicsSceneMouseEvent event(QEvent::GraphicsSceneMouseMove);
event.setScenePos(point);
@ -794,6 +794,7 @@ void tst_QGraphicsItem::deleteChildItem()
QGraphicsItem *child1 = new QGraphicsRectItem(rect);
QGraphicsItem *child2 = new QGraphicsRectItem(rect);
QGraphicsItem *child3 = new QGraphicsRectItem(rect);
Q_UNUSED(child3);
delete child1;
child2->setParentItem(0);
delete child2;

8
tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp
View File

@ -644,7 +644,7 @@ void AnimatedLayoutItem::setGeometry(const QRectF &geom)
QGraphicsLayoutItem::setGeometry(geom);
}
QSizeF AnimatedLayoutItem::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
QSizeF AnimatedLayoutItem::sizeHint(Qt::SizeHint which, const QSizeF & /* constraint */) const
{
switch (which) {
case Qt::MinimumSize:
@ -760,7 +760,7 @@ private:
QSet<QGraphicsLayoutItem*> *m_destructedSet;
};
QSizeF CustomLayoutItem::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
QSizeF CustomLayoutItem::sizeHint(Qt::SizeHint which, const QSizeF & /* constraint */) const
{
switch (which) {
case Qt::MinimumSize:
@ -800,7 +800,7 @@ private:
QSet<QGraphicsLayoutItem*> *m_destructedSet;
};
QSizeF CustomGraphicsWidget::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
QSizeF CustomGraphicsWidget::sizeHint(Qt::SizeHint which, const QSizeF & /* constraint */) const
{
switch (which) {
case Qt::MinimumSize:
@ -889,7 +889,7 @@ void updateParentWidget(QGraphicsWidget *item)
}
}
QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
QSizeF sizeHint(Qt::SizeHint /* which */, const QSizeF & /* constraint */) const
{
return QSizeF(50,50);
}

3
tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
View File

@ -299,7 +299,7 @@ void tst_QGraphicsLinearLayout::alignment()
int i;
bool addWidget = true;
for (i = 0; i < sizeof(alignmentsToTest)/sizeof(Qt::Alignment); ++i) {
for (size_t i = 0; i < sizeof(alignmentsToTest)/sizeof(Qt::Alignment); ++i) {
QGraphicsLayoutItem *loutItem;
Qt::Alignment align = alignmentsToTest[i];
if (!align && i > 0)
@ -1139,6 +1139,7 @@ void tst_QGraphicsLinearLayout::testStretch()
{
QGraphicsScene scene;
QGraphicsView *view = new QGraphicsView(&scene);
Q_UNUSED(view);
QGraphicsWidget *form = new QGraphicsWidget(0, Qt::Window);
scene.addItem(form);

1
tests/auto/qgraphicsobject/tst_qgraphicsobject.cpp
View File

@ -284,6 +284,7 @@ void tst_QGraphicsObject::deleted()
bool item2_wasDeleted = false;
DeleteTester *item1 = new DeleteTester(&item1_wasDeleted, &item1_parentWasDeleted);
DeleteTester *item2 = new DeleteTester(&item2_wasDeleted, &item2_parentWasDeleted, item1);
Q_UNUSED(item2);
delete item1;
QVERIFY(!item1_wasDeleted); // destructor not called yet

4
tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp
View File

@ -290,7 +290,7 @@ public:
{
}
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
void paint(QPainter *painter, const QStyleOptionGraphicsItem * /* option */, QWidget * /* widget */)
{
painter->setBrush(brush);
painter->drawRect(boundingRect());
@ -348,7 +348,7 @@ void tst_QGraphicsSceneIndex::clear()
int numPaints;
protected:
QRectF boundingRect() const { return QRectF(0, 0, 10, 10); }
void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
void paint(QPainter * /* painter */, const QStyleOptionGraphicsItem *, QWidget *)
{ ++numPaints; }
};

8
tests/auto/qgraphicsview/tst_qgraphicsview.cpp
View File

@ -4009,7 +4009,7 @@ public:
m_viewHasIMEnabledInFocusInEvent = false;
}
void focusInEvent(QFocusEvent *event)
void focusInEvent(QFocusEvent * /* event */)
{
QGraphicsView *view = scene()->views().first();
m_viewHasIMEnabledInFocusInEvent = view->testAttribute(Qt::WA_InputMethodEnabled);
@ -4403,7 +4403,7 @@ void tst_QGraphicsView::QTBUG_5859_exposedRect()
{
public:
CustomScene(const QRectF &rect) : QGraphicsScene(rect) { }
void drawBackground(QPainter *painter, const QRectF &rect)
void drawBackground(QPainter * /* painter */, const QRectF &rect)
{ lastBackgroundExposedRect = rect; }
QRectF lastBackgroundExposedRect;
};
@ -4413,7 +4413,7 @@ void tst_QGraphicsView::QTBUG_5859_exposedRect()
public:
CustomRectItem(const QRectF &rect) : QGraphicsRectItem(rect)
{ setFlag(QGraphicsItem::ItemUsesExtendedStyleOption); }
void paint(QPainter * painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0)
void paint(QPainter * /* painter */, const QStyleOptionGraphicsItem *option, QWidget * /* widget */ = 0)
{ lastExposedRect = option->exposedRect; }
QRectF lastExposedRect;
};
@ -4528,7 +4528,7 @@ public:
setFlag(QGraphicsItem::ItemAcceptsInputMethod, true);
}
QVariant inputMethodQuery(Qt::InputMethodQuery query) const
QVariant inputMethodQuery(Qt::InputMethodQuery) const
{
return mf;
}

1
tests/auto/qhttp/tst_qhttp.cpp
View File

@ -772,6 +772,7 @@ void tst_QHttp::authorization()
http.setUser(user, pass);
http.setHost(host);
int id = http.get(path);
Q_UNUSED(id);
QTimer::singleShot(5000, &loop, SLOT(quit()));
loop.exec();

2
tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
View File

@ -1000,6 +1000,7 @@ public:
public Q_SLOTS:
void finishedSlot() {
QHttpNetworkReply *reply = (QHttpNetworkReply*) sender();
Q_UNUSED(reply);
receivedCount++;
if (receivedCount == requestCount)
@ -1046,6 +1047,7 @@ public:
public Q_SLOTS:
void finishedSlot() {
QHttpNetworkReply *reply = (QHttpNetworkReply*) sender();
Q_UNUSED(reply);
receivedCount++;
if (receivedCount == requestCount)

2
tests/auto/qiodevice/tst_qiodevice.cpp
View File

@ -570,7 +570,7 @@ public:
}
return maxlen;
}
qint64 writeData(const char *data, qint64 maxlen) {
qint64 writeData(const char * /* data */, qint64 /* maxlen */) {
return -1;
}

4
tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
View File

@ -2289,7 +2289,7 @@ void tst_QItemSelectionModel::QTBUG5671_layoutChangedWithAllSelected()
struct MyFilterModel : public QSortFilterProxyModel
{ // Override sort filter proxy to remove even numbered rows.
bool filtering;
virtual bool filterAcceptsRow( int source_row, const QModelIndex& source_parent ) const
virtual bool filterAcceptsRow( int source_row, const QModelIndex& /* source_parent */) const
{
return !filtering || !( source_row & 1 );
}
@ -2373,7 +2373,7 @@ public:
}
public slots:
void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected)
void selectionChanged(const QItemSelection & /* selected */, const QItemSelection &deselected)
{
foreach(const QModelIndex &index, deselected.indexes()) {
QVERIFY(!m_itemSelectionModel->selection().contains(index));

10
tests/auto/qlayout/tst_qlayout.cpp
View File

@ -182,16 +182,16 @@ void tst_QLayout::smartMaxSize()
int expectedIndex = 0;
int regressionCount = 0;
for (int p = 0; p < sizeof(policies)/sizeof(QSizePolicy::Policy); ++p) {
for (size_t p = 0; p < sizeof(policies)/sizeof(QSizePolicy::Policy); ++p) {
QSizePolicy sizePolicy;
sizePolicy.setHorizontalPolicy(policies[p]);
for (int min = 0; min < sizeof(sizeCombinations)/sizeof(int); ++min) {
for (size_t min = 0; min < sizeof(sizeCombinations)/sizeof(int); ++min) {
int minSize = sizeCombinations[min];
for (int max = 0; max < sizeof(sizeCombinations)/sizeof(int); ++max) {
for (size_t max = 0; max < sizeof(sizeCombinations)/sizeof(int); ++max) {
int maxSize = sizeCombinations[max];
for (int sh = 0; sh < sizeof(sizeCombinations)/sizeof(int); ++sh) {
for (size_t sh = 0; sh < sizeof(sizeCombinations)/sizeof(int); ++sh) {
int sizeHint = sizeCombinations[sh];
for (int a = 0; a < sizeof(alignments)/sizeof(int); ++a) {
for (size_t a = 0; a < sizeof(alignments)/sizeof(int); ++a) {
Qt::Alignment align = alignments[a];
QSize sz = qSmartMaxSize(QSize(sizeHint, 1), QSize(minSize, 1), QSize(maxSize, 1), sizePolicy, align);
int width = sz.width();

8
tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp
View File

@ -65,9 +65,9 @@ class DownloadCheckWidget : public QWidget
{
Q_OBJECT
public:
DownloadCheckWidget(QWidget *parent = 0) : QWidget(parent)
, progressDlg(this), netmanager(this)
, lateReadyRead(true)
DownloadCheckWidget(QWidget *parent = 0) :
QWidget(parent), lateReadyRead(true), zeroCopy(false),
progressDlg(this), netmanager(this)
{
progressDlg.setRange(1, 100);
QMetaObject::invokeMethod(this, "go", Qt::QueuedConnection);
@ -96,12 +96,14 @@ public slots:
void dataReadProgress(qint64 done, qint64 total)
{
QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender());
Q_UNUSED(reply);
progressDlg.setMaximum(total);
progressDlg.setValue(done);
}
void dataReadyRead()
{
QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender());
Q_UNUSED(reply);
lateReadyRead = true;
}
void finishedFromReply()

4
tests/auto/qpicture/tst_qpicture.cpp
View File

@ -81,7 +81,7 @@ void tst_QPicture::getSetCheck()
// void QPictureIO::setPicture(const QPicture &)
// const char * QPictureIO::format()
// void QPictureIO::setFormat(const char *)
char *var2 = "PNG";
const char var2[] = "PNG";
obj1.setFormat(var2);
QCOMPARE(var2, obj1.format());
obj1.setFormat((char *)0);
@ -90,7 +90,7 @@ void tst_QPicture::getSetCheck()
// const char * QPictureIO::parameters()
// void QPictureIO::setParameters(const char *)
char *var3 = "Bogus data";
const char var3[] = "Bogus data";
obj1.setParameters(var3);
QCOMPARE(var3, obj1.parameters());
obj1.setParameters((char *)0);

2
tests/auto/qprinter/tst_qprinter.cpp
View File

@ -406,6 +406,8 @@ void tst_QPrinter::testMargins()
QFETCH(int, width);
QFETCH(int, height);
QFETCH(bool, fullpage);
Q_UNUSED(width);
Q_UNUSED(height);
QPrinter printer;
QPainter *painter = 0;
printer.setOutputFileName("silly");

1
tests/auto/qprocess/testGuiProcess/main.cpp
View File

@ -49,6 +49,7 @@ int main(int argc, char **argv)
label.show();
int c;
Q_UNUSED(c);
fgetc(stdin); // block until fed
qDebug("Process is running");

2
tests/auto/qprocess/testProcessSpacesArgs/main.cpp
View File

@ -62,7 +62,7 @@ int main(int argc, char ** argv)
for (int i = 0; i < argc; ++i) {
if (i)
printf("|");
printf(argv[i]);
printf("%s", argv[i]);
}
#endif
return 0;

2
tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
View File

@ -3193,7 +3193,7 @@ public:
}
protected:
bool filterAcceptsColumn(int column, const QModelIndex &source_parent) const
bool filterAcceptsColumn(int column, const QModelIndex & /* source_parent */) const
{
return column % 2 != 0;
}

6
tests/auto/qsql/tst_qsql.cpp
View File

@ -140,7 +140,7 @@ void tst_QSql::basicDriverTest()
continue;
}
qDebug( qPrintable( QLatin1String( "Testing: " ) + tst_Databases::dbToString( db ) ) );
qDebug("Testing: %s", qPrintable(tst_Databases::dbToString( db )));
QSqlRecord rInf = db.record( tableName );
QCOMPARE( rInf.count(), 2 );
@ -230,8 +230,8 @@ void tst_QSql::openErrorRecovery()
// force an open error
if ( db.open( "dummy130977", "doesnt_exist" ) ) {
qDebug( qPrintable(QLatin1String("Promiscuous database server without access control - test skipped for ") +
tst_Databases::dbToString( db )) );
qDebug("Promiscuous database server without access control - test skipped for %s",
qPrintable(tst_Databases::dbToString( db )) );
QVERIFY(1);
continue;
}

10
tests/auto/qsqldatabase/tst_qsqldatabase.cpp
View File

@ -212,7 +212,6 @@ private:
// number of records to be inserted per testfunction
static const int ITERATION_COUNT = 2;
static int pkey = 1;
//helper class for database specific tests
struct FieldDef {
@ -483,8 +482,9 @@ void tst_QSqlDatabase::tables()
if (!q.exec("CREATE VIEW " + qtest_view + " as select * from " + qtest)) {
qDebug(QString("DBMS '%1' cannot handle VIEWs: %2").arg(
tst_Databases::dbToString(db)).arg(QString(tst_Databases::printError(q.lastError()))).toLatin1());
qDebug("DBMS '%s' cannot handle VIEWs: %s",
qPrintable(tst_Databases::dbToString(db)),
qPrintable(tst_Databases::printError(q.lastError())));
views = false;
}
@ -1080,7 +1080,7 @@ void tst_QSqlDatabase::transaction()
q.clear(); // for SQLite which does not allow any references on rows that shall be rolled back
if (!db.rollback()) {
if (db.driverName().startsWith("QMYSQL")) {
qDebug("MySQL: " + tst_Databases::printError(db.lastError()));
qDebug("MySQL: %s", qPrintable(tst_Databases::printError(db.lastError())));
QSKIP("MySQL transaction failed ", SkipSingle); //non-fatal
} else {
QFAIL("Could not rollback transaction: " + tst_Databases::printError(db.lastError()));
@ -1861,7 +1861,7 @@ void tst_QSqlDatabase::oci_serverDetach()
}
}
if(!db.open())
qFatal(tst_Databases::printError(db.lastError(), db));
qFatal("%s", qPrintable(tst_Databases::printError(db.lastError(), db)));
}
void tst_QSqlDatabase::oci_xmltypeSupport()

6
tests/auto/qsqlquery/tst_qsqlquery.cpp
View File

@ -1558,7 +1558,7 @@ void tst_QSqlQuery::transaction()
if ( !q.exec( "rollback" ) ) {
if ( db.driverName().startsWith( "QMYSQL" ) ) {
qDebug( "MySQL: " + tst_Databases::printError( q.lastError() ) );
qDebug( "MySQL: %s", qPrintable(tst_Databases::printError( q.lastError() ) ));
QSKIP( "MySQL transaction failed ", SkipSingle ); //non-fatal
} else
QFAIL( "Could not rollback transaction: " + tst_Databases::printError( q.lastError() ) );
@ -1578,8 +1578,8 @@ void tst_QSqlQuery::transaction()
QVERIFY_SQL( q2, exec( "select * from" + qtest + " where id = 42" ) );
if ( q2.next() )
qDebug( QString( "DBMS '%1' doesn't support query based transactions with concurrent access" ).arg(
tst_Databases::dbToString( db ) ).toLatin1() );
qDebug("DBMS '%s' doesn't support query based transactions with concurrent access",
qPrintable(tst_Databases::dbToString( db )));
QVERIFY_SQL( q, exec( "commit" ) );

3
tests/auto/qsslsocket/tst_qsslsocket.cpp
View File

@ -1561,6 +1561,7 @@ protected:
#else
bool ret = server.waitForNewConnection(20000);
#endif
Q_UNUSED(ret);
// delayed start of encryption
QTest::qSleep(100);
@ -1955,7 +1956,7 @@ void tst_QSslSocket::writeBigChunk()
QByteArray data;
data.resize(1024*1024*10); // 10 MB
// init with garbage. needed so ssl cannot compress it in an efficient way.
for (int i = 0; i < data.size() / sizeof(int); i++) {
for (size_t i = 0; i < data.size() / sizeof(int); i++) {
int r = qrand();
data.data()[i*sizeof(int)] = r;
}

2
tests/auto/qstatemachine/tst_qstatemachine.cpp
View File

@ -4374,7 +4374,9 @@ void tst_QStateMachine::eventClassesExported()
{
// make sure this links
QStateMachine::WrappedEvent *wrappedEvent = new QStateMachine::WrappedEvent(0, 0);
Q_UNUSED(wrappedEvent);
QStateMachine::SignalEvent *signalEvent = new QStateMachine::SignalEvent(0, 0, QList<QVariant>());
Q_UNUSED(signalEvent);
}
void tst_QStateMachine::stopInTransitionToFinalState()

2
tests/auto/qstyle/tst_qstyle.cpp
View File

@ -373,6 +373,8 @@ void tst_QStyle::testScrollBarSubControls(QStyle* style)
#ifdef Q_OS_WINCE_WM
if (qobject_cast<QWindowsMobileStyle*>(style) && qt_wince_is_smartphone())
QSKIP("SmartPhone doesn't have scrollbar subcontrols.", SkipAll);
#else
Q_UNUSED(style);
#endif
QScrollBar scrollBar;

2
tests/auto/qtcpsocket/tst_qtcpsocket.cpp
View File

@ -430,7 +430,7 @@ void tst_QTcpSocket::socketsConstructedBeforeEventLoop()
earlyConstructedSockets->endPoints[1]->close();
}
void tst_QTcpSocket::earlySocketBytesSent(qint64 bytes)
void tst_QTcpSocket::earlySocketBytesSent(qint64 /* bytes */)
{
earlyBytesWrittenCount++;
}

1
tests/auto/qtextdocumentlayout/tst_qtextdocumentlayout.cpp
View File

@ -260,6 +260,7 @@ void tst_QTextDocumentLayout::floatingTablePageBreak()
QTextTableFormat tableFormat;
tableFormat.setPosition(QTextFrameFormat::FloatLeft);
QTextTable *table = cursor.insertTable(50, 1, tableFormat);
Q_UNUSED(table);
// Make height of document 2/3 of the table, fitting the table into two pages
QSizeF documentSize = doc->size();

2
tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp
View File

@ -1108,6 +1108,8 @@ void tst_QTextPieceTable::removeWithChildFrame()
QTextFrame *frame = table->insertFrame(1, 6, ffmt);
QTextFrame *childFrame = table->insertFrame(3, 5, ffmt);
Q_UNUSED(frame);
Q_UNUSED(childFrame);
// used to give a failing assertion
table->remove(2, 5);

2
tests/auto/qthreadstorage/tst_qthreadstorage.cpp
View File

@ -320,7 +320,7 @@ public:
static QBasicAtomicInt count;
inline SPointer() { count.ref(); }
inline ~SPointer() { count.deref(); }
inline SPointer(const SPointer &other) { count.ref(); }
inline SPointer(const SPointer & /* other */) { count.ref(); }
};
QBasicAtomicInt SPointer::count = Q_BASIC_ATOMIC_INITIALIZER(0);

4
tests/auto/qtreeview/tst_qtreeview.cpp
View File

@ -3800,7 +3800,7 @@ class Model_11466 : public QAbstractItemModel
{
Q_OBJECT
public:
Model_11466(QObject *parent) :
Model_11466(QObject * /* parent */) :
m_block(false)
{
// set up the model to have two top level items and a few others
@ -3817,7 +3817,7 @@ public:
return 2; // two top level items
}
int columnCount(const QModelIndex &parent) const
int columnCount(const QModelIndex & /* parent */) const
{
return 2;
}

1
tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp
View File

@ -924,6 +924,7 @@ void tst_QPainter::fillPrimitives_helper(QPainter *p, PrimitiveType type, Primit
case Primitive_Float_RectPath: QBENCHMARK { p->drawPath(s->f_path_rect); } break;
case Primitive_Float_2RectPath: QBENCHMARK { p->drawPath(s->f_path_2rects); } break;
case Primitive_Float_EllipsePath: QBENCHMARK { p->drawPath(s->f_path_ellipse); } break;
case Primitive_Last_Primitive: break;
}
}

2
tests/benchmarks/gui/painting/qtracebench/tst_qtracebench.cpp
View File

@ -149,7 +149,7 @@ void ReplayWidget::paintEvent(QPaintEvent *)
}
}
void ReplayWidget::resizeEvent(QResizeEvent *event)
void ReplayWidget::resizeEvent(QResizeEvent * /* event */)
{
visibleUpdates.clear();

2
tests/benchmarks/gui/text/qtext/main.cpp
View File

@ -411,6 +411,7 @@ void tst_QText::paintLayoutToPixmap_painterFill()
void tst_QText::document()
{
QTextDocument *doc = new QTextDocument;
Q_UNUSED(doc)
QBENCHMARK {
QTextDocument *doc = new QTextDocument;
@ -453,6 +454,7 @@ void tst_QText::paintDocToPixmap_painterFill()
void tst_QText::control()
{
QTextControl *control = new QTextControl(m_shortLorem);
Q_UNUSED(control);
QBENCHMARK {
QTextControl *control = new QTextControl;

2
tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
View File

@ -501,7 +501,7 @@ void tst_qnetworkreply::echoPerformance()
QByteArray data;
data.resize(1024*1024*10); // 10 MB
// init with garbage. needed so ssl cannot compress it in an efficient way.
for (int i = 0; i < data.size() / sizeof(int); i++) {
for (size_t i = 0; i < data.size() / sizeof(int); i++) {
int r = qrand();
data.data()[i*sizeof(int)] = r;
}