Merge branch '4.6'

Conflicts:
	src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp

2 files changed, 4 insertions, 13 deletions

diff --git a/demos/browser/networkaccessmanager.cpp b/demos/browser/networkaccessmanager.cpp
index 3ce9c08..1e6dffd 100644
--- a/demos/browser/networkaccessmanager.cpp
+++ b/demos/browser/networkaccessmanager.cpp
@@ -106,10 +106,13 @@ void NetworkAccessManager::requestFinished(QNetworkReply *reply)
     if (reply->attribute(QNetworkRequest::ConnectionEncryptedAttribute).toBool() == true)
         requestFinishedSecureCount++;
 
+    if (requestFinishedCount % 10)
+        return;
+
     double pctCached = (double(requestFinishedFromCacheCount) * 100.0/ double(requestFinishedCount));
     double pctPipelined = (double(requestFinishedPipelinedCount) * 100.0/ double(requestFinishedCount));
     double pctSecure = (double(requestFinishedSecureCount) * 100.0/ double(requestFinishedCount));
-    qDebug("%lli requests [%3.2f%% from cache] [%3.2f%% pipelined] [%3.2f%% SSL/TLS]", requestFinishedCount, pctCached, pctPipelined, pctSecure);
+    qDebug("STATS [%lli requests total] [%3.2f%% from cache] [%3.2f%% pipelined] [%3.2f%% SSL/TLS]", requestFinishedCount, pctCached, pctPipelined, pctSecure);
 
 }
 
diff --git a/demos/deform/pathdeform.cpp b/demos/deform/pathdeform.cpp
index 5530010..07c7829 100644
--- a/demos/deform/pathdeform.cpp
+++ b/demos/deform/pathdeform.cpp
@@ -53,11 +53,6 @@
 #include <QDesktopWidget>
 #include <qmath.h>
 
-#if defined(Q_OS_SYMBIAN)
-// TODO: Remove all FONT_OUTLINE_TWEAK related code as soon as the S60FontEngine can deliver outlines
-#define FONT_OUTLINE_TWEAK
-#endif
-
 PathDeformControls::PathDeformControls(QWidget *parent, PathDeformRenderer* renderer, bool smallScreen)
       : QWidget(parent)
 {
@@ -246,13 +241,6 @@ void PathDeformControls::layoutForSmallScreen()
     QRect screen_size = QApplication::desktop()->screenGeometry();
     radiusSlider->setValue(qMin(screen_size.width(), screen_size.height())/5);
 
-#ifdef FONT_OUTLINE_TWEAK
-    radiusSlider->setValue(qMin(screen_size.width(), screen_size.height())/7);
-    fontSizeLabel->setText("Qt Logo Size:");
-    m_renderer->setText("A"); // Any Letter would be fine
-    fontSizeSlider->setValue(100);
-#endif
-
     m_renderer->setText(tr("Qt"));
 }