diff options
Diffstat (limited to 'tests')
10 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/corelib/json/tst_qtjson.cpp b/tests/auto/corelib/json/tst_qtjson.cpp index 5498c890fe..bdc3aeb9ed 100644 --- a/tests/auto/corelib/json/tst_qtjson.cpp +++ b/tests/auto/corelib/json/tst_qtjson.cpp @@ -291,7 +291,7 @@ void TestQtJson::testObjectSimple() QVERIFY2(keys.contains("string"), "key string not found"); QVERIFY2(keys.contains("boolean"), "key boolean not found"); - // if we put a JsonValue into the JsonObject and retreive + // if we put a JsonValue into the JsonObject and retrieve // it, it should be identical. QJsonValue value(QLatin1String("foo")); object.insert("value", value); @@ -340,7 +340,7 @@ void TestQtJson::testArraySimple() QCOMPARE(array.at(2).toBool(), true); QCOMPARE(array.size(), 3); - // if we put a JsonValue into the JsonArray and retreive + // if we put a JsonValue into the JsonArray and retrieve // it, it should be identical. QJsonValue value(QLatin1String("foo")); array.append(value); diff --git a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp index ae3765df10..2b1284d81e 100644 --- a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp +++ b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp @@ -1308,7 +1308,7 @@ void tst_QTextScriptEngine::thaiWithZWJ() // But make sure that we don't hide anything else QCOMPARE(e->layoutData->items.size(), 11); QCOMPARE(e->layoutData->items[0].num_glyphs, ushort(7)); // Thai: The ZWJ and ZWNJ characters are inherited, so should be part of the thai script - QCOMPARE(e->layoutData->items[1].num_glyphs, ushort(1)); // Common: The smart quotes cannot be handled by thai, so should be a seperate item + QCOMPARE(e->layoutData->items[1].num_glyphs, ushort(1)); // Common: The smart quotes cannot be handled by thai, so should be a separate item QCOMPARE(e->layoutData->items[2].num_glyphs, ushort(1)); // Thai: Thai character QCOMPARE(e->layoutData->items[3].num_glyphs, ushort(1)); // Common: Ellipsis QCOMPARE(e->layoutData->items[4].num_glyphs, ushort(1)); // Thai: Thai character diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp index d8f5a0428f..c32699f224 100644 --- a/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp +++ b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp @@ -146,7 +146,7 @@ void tst_QNetworkProxyFactory::systemProxyForQuery_data() QTest::newRow("ftp-tag") << (int)QNetworkProxyQuery::TcpSocket << QUrl() << QString("ftp") << QString("qt-project.org") << 21 << (int)QNetworkProxy::TunnelingCapability; QTest::newRow("https-tag") << (int)QNetworkProxyQuery::TcpSocket << QUrl() << QString("https") << QString("qt-project.org") << 443 << (int)QNetworkProxy::TunnelingCapability; #ifdef Q_OS_WIN - //in Qt 4.8, "socks" would get the socks proxy, but we dont want to enforce that for all platforms + //in Qt 4.8, "socks" would get the socks proxy, but we don't want to enforce that for all platforms QTest::newRow("socks-tag") << (int)QNetworkProxyQuery::TcpSocket << QUrl() << QString("socks") << QString("qt-project.org") << 21 << (int)(QNetworkProxy::TunnelingCapability | QNetworkProxy::ListeningCapability); #endif //windows: ssh is not a tag provided by the os, but any tunneling proxy is acceptable diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp index 223211eea1..e214107b28 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -504,7 +504,7 @@ void tst_QTcpSocket::bind_data() } // additionally, try bind to known-bad addresses, and make sure this doesn't work - // these ranges are guarenteed to be reserved for 'documentation purposes', + // these ranges are guaranteed to be reserved for 'documentation purposes', // and thus, should be unused in the real world. Not that I'm assuming the // world is full of competent administrators, or anything. QStringList knownBad; diff --git a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp index dc44a026d2..9d27b7db08 100644 --- a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp +++ b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp @@ -837,7 +837,7 @@ public: virtual void destroyEditor(QWidget *editor, const QModelIndex &i) const { // This is a reimplementation of QAbstractItemDelegate::destroyEditor just set the variable m_editor to 0 - // The only reason we do this is to avoid the not recomended direct delete of editor (destroyEditor uses deleteLater) + // The only reason we do this is to avoid the not recommended direct delete of editor (destroyEditor uses deleteLater) QItemDelegate::destroyEditor(editor, i); // Allow destroy m_editor = 0; // but clear the variable } diff --git a/tests/benchmarks/corelib/tools/qregexp/main.cpp b/tests/benchmarks/corelib/tools/qregexp/main.cpp index d26731edba..518c230590 100644 --- a/tests/benchmarks/corelib/tools/qregexp/main.cpp +++ b/tests/benchmarks/corelib/tools/qregexp/main.cpp @@ -520,7 +520,7 @@ void tst_qregexp::horribleReplaceJSC() { QScriptValue r; QScriptEngine engine; - // the m flag doesnt actually work here; dunno + // the m flag doesn't actually work here; dunno engine.globalObject().setProperty("s", str2.replace('\n', ' ')); QScriptValue replaceFunc = engine.evaluate("(function() { return s.replace(/.*#""define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+).*/gm, '$1.$2.$3') } )"); QVERIFY(replaceFunc.isFunction()); diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/topbar.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/topbar.cpp index d3840ba1bc..bd089e9b75 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/topbar.cpp +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/topbar.cpp @@ -142,7 +142,7 @@ void TopBar::resizeEvent(QGraphicsSceneResizeEvent* /*event*/) QSize topBarStatusBarLeftSize = m_topBarStatusBarLeft.size(); QSize topBarStatusBarMiddleSize = m_topBarStatusBarMiddle.size(); - //Location for Title text 5% width, 35% heigth of the background pixmap + //Location for Title text 5% width, 35% height of the background pixmap m_topBarTitlePoint = QPoint(topBarPixmapSize.width()* 0.05, topBarPixmapSize.height() * 0.35); diff --git a/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp index 7736ce5481..42b96ef4cf 100644 --- a/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -802,7 +802,7 @@ void tst_qnetworkreply::httpsRequestChain() for (int i = 0; i < count; i++) helper.requestList.append(request); - // Warm up DNS cache and then immediatly start HTTP + // Warm up DNS cache and then immediately start HTTP QHostInfo::lookupHost(QtNetworkSettings::serverName(), &helper, SLOT(doNextRequest())); //QHostInfo::lookupHost("www.nokia.com", &helper, SLOT(doNextRequest())); diff --git a/tests/benchmarks/network/kernel/qhostinfo/main.cpp b/tests/benchmarks/network/kernel/qhostinfo/main.cpp index 23b45f27e9..817ef82e2c 100644 --- a/tests/benchmarks/network/kernel/qhostinfo/main.cpp +++ b/tests/benchmarks/network/kernel/qhostinfo/main.cpp @@ -77,7 +77,7 @@ public slots: void tst_qhostinfo::init() { - // delete the cache so inidividual testcase results are independant from each other + // delete the cache so inidividual testcase results are independent from each other qt_qhostinfo_clear_cache(); } diff --git a/tests/manual/bearerex/bearerex.cpp b/tests/manual/bearerex/bearerex.cpp index c85fc439e9..14533638d8 100644 --- a/tests/manual/bearerex/bearerex.cpp +++ b/tests/manual/bearerex/bearerex.cpp @@ -568,7 +568,7 @@ void SessionTab::finished(quint32 errorCode, qint64 dataReceived, QString errorT msgBox.exec(); // Check if the networksession still exists - it may have gone after returning from // the modal dialog (in the case that app has been closed, and deleting QHttp will - // trigger the done() invokation). + // trigger the done() invocation). if (m_NetworkSession) { sentRecDataLineEdit->setText(QString::number(m_NetworkSession->bytesWritten())+ QString(" / ")+ |