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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Compile
  Implement a special case, simplified vertex shader for complex geometry
  Revert "small cleanup regarding delayed layout in itemviews"
  Make sure the delete and backspace keys are ignored when keyb-searching
  Fix a crash in QSortFilterProxyModel when deleting a row
  small cleanup regarding delayed layout in itemviews
  Fixed wasted space in the texture cache.
  Get debug code compiling since function signature changes
  --warn;
  That file was forgotten when adding SSE support under mingw

1 files changed, 4 insertions, 4 deletions

diff --git a/src/declarative/qml/qdeclarativelist.h b/src/declarative/qml/qdeclarativelist.h
index eac4967..ed402a8 100644
--- a/src/declarative/qml/qdeclarativelist.h
+++ b/src/declarative/qml/qdeclarativelist.h
@@ -61,12 +61,12 @@ struct QDeclarativeListProperty {
     typedef T *(*AtFunction)(QDeclarativeListProperty<T> *, int);
     typedef void (*ClearFunction)(QDeclarativeListProperty<T> *);
 
-    QDeclarativeListProperty() 
+    QDeclarativeListProperty()
         : object(0), data(0), append(0), count(0), at(0), clear(0), dummy1(0), dummy2(0) {}
     QDeclarativeListProperty(QObject *o, QList<T *> &list)
         : object(o), data(&list), append(qlist_append), count(qlist_count), at(qlist_at),
           clear(qlist_clear), dummy1(0), dummy2(0) {}
-    QDeclarativeListProperty(QObject *o, void *d, AppendFunction a, CountFunction c = 0, AtFunction t = 0, 
+    QDeclarativeListProperty(QObject *o, void *d, AppendFunction a, CountFunction c = 0, AtFunction t = 0,
                     ClearFunction r = 0)
         : object(o), data(d), append(a), count(c), at(t), clear(r), dummy1(0), dummy2(0) {}
 
@@ -81,7 +81,7 @@ struct QDeclarativeListProperty {
 
     QObject *object;
     void *data;
-    
+
     AppendFunction append;
 
     CountFunction count;
@@ -94,7 +94,7 @@ struct QDeclarativeListProperty {
 
 private:
     static void qlist_append(QDeclarativeListProperty *p, T *v) {
-        ((QList<T *> *)p->data)->append(v); 
+        ((QList<T *> *)p->data)->append(v);
     }
     static int qlist_count(QDeclarativeListProperty *p) {
         return ((QList<T *> *)p->data)->count();