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

5 files changed, 21 insertions, 19 deletions

diff --git a/tests/benchmarks/declarative/painting/paintbenchmark.cpp b/tests/benchmarks/declarative/painting/paintbenchmark.cpp
index d6a873c..8b8fc5e 100644
--- a/tests/benchmarks/declarative/painting/paintbenchmark.cpp
+++ b/tests/benchmarks/declarative/painting/paintbenchmark.cpp
@@ -48,10 +48,7 @@
 #include <QVBoxLayout>
 #include <QTime>
 #include <QDebug>
-
-#ifdef HAVE_STATICTEXT
-#include <private/qstatictext_p.h>
-#endif
+#include <QStaticText>
 
 int iterations = 20;
 const int count = 600;
@@ -105,7 +102,6 @@ void paint_QTextLayout_cache(QPainter &p)
     paint_QTextLayout(p, true);
 }
 
-#ifdef HAVE_STATICTEXT
 void paint_QStaticText(QPainter &p, bool useOptimizations)
 {
     static QStaticText *staticText[lines];
@@ -113,7 +109,10 @@ void paint_QStaticText(QPainter &p, bool useOptimizations)
     if (first) {
         for (int i = 0; i < lines; ++i) {
             staticText[i] = new QStaticText(strings[i]);
-            staticText[i]->setUseBackendOptimizations(useOptimizations);
+            if (useOptimizations)
+                staticText[i]->setPerformanceHint(QStaticText::AggressiveCaching);
+            else
+                staticText[i]->setPerformanceHint(QStaticText::ModerateCaching);
         }
         first = false;
     }
@@ -133,7 +132,6 @@ void paint_QStaticText_optimizations(QPainter &p)
 {
     paint_QStaticText(p, true);
 }
-#endif
 
 void paint_QPixmapCachedText(QPainter &p)
 {
@@ -203,10 +201,8 @@ struct {
 } funcs[] = {
     { "QTextLayoutNoCache", &paint_QTextLayout_noCache },
     { "QTextLayoutWithCache", &paint_QTextLayout_cache },
-#ifdef HAVE_STATICTEXT
     { "QStaticTextNoBackendOptimizations", &paint_QStaticText_noOptimizations },
     { "QStaticTextWithBackendOptimizations", &paint_QStaticText_optimizations },
-#endif
     { "CachedText", &paint_QPixmapCachedText },
     { "RoundedRect", &paint_RoundedRect },
     { "CachedRoundedRect", &paint_QPixmapCachedRoundedRect },
diff --git a/tools/assistant/tools/assistant/helpviewer_qtb.cpp b/tools/assistant/tools/assistant/helpviewer_qtb.cpp
index 3aafe67..1e439dc 100644
--- a/tools/assistant/tools/assistant/helpviewer_qtb.cpp
+++ b/tools/assistant/tools/assistant/helpviewer_qtb.cpp
@@ -38,11 +38,11 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#if defined(QT_NO_WEBKIT)
-
 #include "helpviewer_qtb.h"
 #include "helpviewer_qwv.h"
 
+#if defined(QT_NO_WEBKIT)
+
 #include "centralwidget.h"
 #include "helpenginewrapper.h"
 #include "tracer.h"
diff --git a/tools/assistant/tools/assistant/helpviewer_qtb.h b/tools/assistant/tools/assistant/helpviewer_qtb.h
index e927b34..2d29774 100644
--- a/tools/assistant/tools/assistant/helpviewer_qtb.h
+++ b/tools/assistant/tools/assistant/helpviewer_qtb.h
@@ -38,11 +38,13 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#if defined(QT_NO_WEBKIT)
-
 #ifndef HELPVIEWERQTB_H
 #define HELPVIEWERQTB_H
 
+#include <QtCore/qglobal.h>
+
+#if defined(QT_NO_WEBKIT)
+
 #include "helpviewer.h"
 
 #include <QtCore/QUrl>
@@ -111,6 +113,6 @@ private:
 
 QT_END_NAMESPACE
 
-#endif  // HELPVIEWERQTB_H
-
 #endif  // QT_NO_WEBKIT
+
+#endif  // HELPVIEWERQTB_H
diff --git a/tools/assistant/tools/assistant/helpviewer_qwv.cpp b/tools/assistant/tools/assistant/helpviewer_qwv.cpp
index 4857e00..e302b5e 100644
--- a/tools/assistant/tools/assistant/helpviewer_qwv.cpp
+++ b/tools/assistant/tools/assistant/helpviewer_qwv.cpp
@@ -38,10 +38,11 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#if !defined(QT_NO_WEBKIT)
 
 #include "helpviewer_qwv.h"
 
+#if !defined(QT_NO_WEBKIT)
+
 #include "centralwidget.h"
 #include "helpenginewrapper.h"
 #include "tracer.h"
diff --git a/tools/assistant/tools/assistant/helpviewer_qwv.h b/tools/assistant/tools/assistant/helpviewer_qwv.h
index 3f2e537..fbfbaac 100644
--- a/tools/assistant/tools/assistant/helpviewer_qwv.h
+++ b/tools/assistant/tools/assistant/helpviewer_qwv.h
@@ -38,11 +38,14 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#if !defined(QT_NO_WEBKIT)
 
 #ifndef HELPVIEWERQWV_H
 #define HELPVIEWERQWV_H
 
+#include <QtCore/qglobal.h>
+
+#if !defined(QT_NO_WEBKIT)
+
 #include "helpviewer.h"
 
 #include <QtGui/QAction>
@@ -117,6 +120,6 @@ private:
 
 QT_END_NAMESPACE
 
-#endif  // HELPVIEWERQWV_H
-
 #endif  // !QT_NO_WEBKIT
+
+#endif  // HELPVIEWERQWV_H