diff --git a/doc/global/template/style/icomoon.eot b/doc/global/template/style/icomoon.eot old mode 100755 new mode 100644 diff --git a/doc/global/template/style/icomoon.svg b/doc/global/template/style/icomoon.svg old mode 100755 new mode 100644 diff --git a/doc/global/template/style/icomoon.ttf b/doc/global/template/style/icomoon.ttf old mode 100755 new mode 100644 diff --git a/doc/global/template/style/icomoon.woff b/doc/global/template/style/icomoon.woff old mode 100755 new mode 100644 diff --git a/src/gui/painting/qbezier.cpp b/src/gui/painting/qbezier.cpp index e5c9e8d773..8e0e76f787 100644 --- a/src/gui/painting/qbezier.cpp +++ b/src/gui/painting/qbezier.cpp @@ -401,8 +401,8 @@ int QBezier::shifted(QBezier *curveSegments, int maxSegments, qreal offset, floa Q_ASSERT(curveSegments); Q_ASSERT(maxSegments > 0); - if (x1 == x2 && x1 == x3 && x1 == x4 && - y1 == y2 && y1 == y3 && y1 == y4) + if (qFuzzyCompare(x1, x2) && qFuzzyCompare(x1, x3) && qFuzzyCompare(x1, x4) && + qFuzzyCompare(y1, y2) && qFuzzyCompare(y1, y3) && qFuzzyCompare(y1, y4)) return 0; --maxSegments; diff --git a/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp index b2b583fa9c..708e7ebca8 100644 --- a/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp +++ b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp @@ -38,7 +38,7 @@ #include -#define EXAMPLE_URL "http://user:pass@www.example.com/#foo" +#define EXAMPLE_URL "http://user:pass@localhost:4/#foo" //cached objects are organized into these many subdirs #define NUM_SUBDIRECTORIES 16 @@ -409,7 +409,7 @@ void tst_QNetworkDiskCache::accessAfterRemoveReadyReadSlot() void tst_QNetworkDiskCache::setCookieHeader() // QTBUG-41514 { SubQNetworkDiskCache *cache = new SubQNetworkDiskCache(); - url = QUrl("http://www.foo.com/cookieTest.html"); + url = QUrl("http://localhost:4/cookieTest.html"); // hopefully no one is running an HTTP server on port 4 QNetworkCacheMetaData metaData; metaData.setUrl(url); @@ -518,7 +518,7 @@ void tst_QNetworkDiskCache::expire() if (i % 3 == 0) QTest::qWait(2000); QNetworkCacheMetaData m; - m.setUrl(QUrl("http://www.foo.com/" + QString::number(i))); + m.setUrl(QUrl("http://localhost:4/" + QString::number(i))); QIODevice *d = cache.prepare(m); QString bigString; bigString.fill(QLatin1Char('Z'), (1024 * 1024 / 4)); @@ -540,7 +540,7 @@ void tst_QNetworkDiskCache::expire() std::sort(cacheList.begin(), cacheList.end()); for (int i = 0; i < cacheList.count(); ++i) { QString fileName = cacheList[i]; - QCOMPARE(fileName, QString("http://www.foo.com/%1").arg(i + 6)); + QCOMPARE(fileName, QString("http://localhost:4/%1").arg(i + 6)); } }