Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Make declarative pixmap cache easier to use
  Prepare for QTest persistent store for visual tests.
  Loosen font-sensitive test.
  Set correct license header.
  Work around QTBUG-11929
  <br/> shouldn't trigger a new format range in QDeclarativeStyledText.
  Add styled text layout benchmark.
  Optimize QDeclarativeStyledText.
  Don't write to the logger widget while the application is closing down.
  Fix exponential behavior of QTextCursor::removeSelectedText
  Fix test for N900 (ARM-specific SVG results).
  docs - fix doc links, minor improvements
  Fix TextEdit bitmap tests testing the wrong element
  Make autotests work with qreal == float (in addition to double).
  Fix TextInput text getting improperly clipped
  fix doc links
  Fix docs to link to the new QML Viewer page instead of the Runtime page
  qmlviewer: Update the proxy factory when the user changes the proxy.
  Don't accept *files* that exist when *directory* is required.

1 files changed, 0 insertions, 2 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage_p_p.h b/src/declarative/graphicsitems/qdeclarativeborderimage_p_p.h
index 01e4a00..65583d6 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage_p_p.h
@@ -66,7 +66,6 @@ class QDeclarativeBorderImagePrivate : public QDeclarativeImageBasePrivate
 public:
     QDeclarativeBorderImagePrivate()
       : border(0), sciReply(0),
-        sciPendingPixmapCache(false),
         horizontalTileMode(QDeclarativeBorderImage::Stretch),
         verticalTileMode(QDeclarativeBorderImage::Stretch),
         redirectCount(0)
@@ -97,7 +96,6 @@ public:
     QDeclarativeScaleGrid *border;
     QUrl sciurl;
     QNetworkReply *sciReply;
-    bool sciPendingPixmapCache;
     QDeclarativeBorderImage::TileMode horizontalTileMode;
     QDeclarativeBorderImage::TileMode verticalTileMode;
     int redirectCount;