diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-04-06 06:52:51 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-04-06 06:52:51 (GMT) |
| commit | 3a632cb5f1c1da5c2e72ce167e35a42778867829 (patch) | |
| tree | 76540ae0ef94b3069afb2f043bd0d26d0b26cc5b /src/declarative/graphicsitems/qdeclarativegridview.cpp | |
| parent | ab9c4f04fe86cbeed28800cbe0473738d9959871 (diff) | |
| parent | cb85dd1db4e42b35fd3727874d718389238b801f (diff) | |
| download | Qt-3a632cb5f1c1da5c2e72ce167e35a42778867829.zip Qt-3a632cb5f1c1da5c2e72ce167e35a42778867829.tar.gz Qt-3a632cb5f1c1da5c2e72ce167e35a42778867829.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativegridview.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativegridview.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp index 30f04f6..8247f17 100644 --- a/src/declarative/graphicsitems/qdeclarativegridview.cpp +++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp @@ -39,12 +39,12 @@ ** ****************************************************************************/ -#include "qdeclarativegridview_p.h" +#include "private/qdeclarativegridview_p.h" -#include "qdeclarativevisualitemmodel_p.h" -#include "qdeclarativeflickable_p_p.h" +#include "private/qdeclarativevisualitemmodel_p.h" +#include "private/qdeclarativeflickable_p_p.h" -#include "qdeclarativesmoothedanimation_p_p.h" +#include "private/qdeclarativesmoothedanimation_p_p.h" #include <qdeclarativeguard_p.h> #include <qlistmodelinterface_p.h> |