From 30e3a2beb1ba48bc4bc5de6d8188f9e8ebf8b5dc Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Tue, 24 Feb 2015 19:05:04 +0300 Subject: Remove unneeded exec permission from icomoon fonts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I47f111b4fa1278889689c28da762fabe94b95015 Reviewed-by: Lisandro Damián Nicanor Pérez Meyer Reviewed-by: Topi Reiniö --- doc/global/template/style/icomoon.eot | Bin doc/global/template/style/icomoon.svg | 0 doc/global/template/style/icomoon.ttf | Bin doc/global/template/style/icomoon.woff | Bin 4 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 doc/global/template/style/icomoon.eot mode change 100755 => 100644 doc/global/template/style/icomoon.svg mode change 100755 => 100644 doc/global/template/style/icomoon.ttf mode change 100755 => 100644 doc/global/template/style/icomoon.woff 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 -- cgit v1.2.3 From 96e9b41e254aaeff2e1bb320791fa6e19f179e2b Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 3 Mar 2015 16:31:52 -0800 Subject: tst_QNetworkDiskCache: Stop using actual web servers www.example.com is a reserved domain (RFC 6761), but IANA is running a web server there. As for www.foo.com, that also exists, is a real website and is often content-filtered in corporations (it triggers a firewall warning for me -- "You attempted to visit a site that is in violation of Intel acceptable use guidelines"). So use a localhost instead, since we don't actually need to connect to the servers to do the work. And since we don't need to connect, I chose port 4 as it's extremely unlikely someone is running an HTTP server there (/etc/services lists it as unassigned). Change-Id: Ia0aac2f09e9245339951ffff13c82439c6d5f945 Reviewed-by: Lars Knoll Reviewed-by: Oswald Buddenhagen --- .../network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp index a2f1668ef5..8eee4bdbb3 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)); } } -- cgit v1.2.3 From 88550543f8b4b7c76bffeebb923ad1f72b774b6e Mon Sep 17 00:00:00 2001 From: Eirik Aavitsland Date: Tue, 3 Mar 2015 14:44:46 +0100 Subject: Painting: Avoid endless loop for certain bezier curves If the coordinates were too close (at the limit of the number accuracy), the splitting algorithm in QBezier::shifted() would never finish. Ref. testcase in bugreport. Task-number: QTBUG-44674 Change-Id: I2a575cdc6284504ef5e3eb2b749857576fe433c3 Reviewed-by: Gunnar Sletta --- src/gui/painting/qbezier.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/painting/qbezier.cpp b/src/gui/painting/qbezier.cpp index 90240d1752..a741c94c16 100644 --- a/src/gui/painting/qbezier.cpp +++ b/src/gui/painting/qbezier.cpp @@ -402,8 +402,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; -- cgit v1.2.3