diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-12-03 22:59:58 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-12-03 22:59:58 (GMT) |
| commit | 436b0fff9d9ba95c0fe582f3b71d15d5a9a8535f (patch) | |
| tree | 9fa98ed5eea2a806ef4e949f8d95a0f25e6c4be1 /src/declarative/graphicsitems/qmlgraphicsflickable.cpp | |
| parent | 5ec35c0756464ec512de0961c2ae41bec39ac2f7 (diff) | |
| parent | 4621061e8c32e234a0d7688e226e92d87172f99b (diff) | |
| download | Qt-436b0fff9d9ba95c0fe582f3b71d15d5a9a8535f.zip Qt-436b0fff9d9ba95c0fe582f3b71d15d5a9a8535f.tar.gz Qt-436b0fff9d9ba95c0fe582f3b71d15d5a9a8535f.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/graphicsitems/qmlgraphicsflickable.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicsflickable.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsflickable.cpp b/src/declarative/graphicsitems/qmlgraphicsflickable.cpp index 806b72f..89c7657 100644 --- a/src/declarative/graphicsitems/qmlgraphicsflickable.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsflickable.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include <private/qmlgraphicsflickable_p.h> -#include <private/qmlgraphicsflickable_p_p.h> +#include "qmlgraphicsflickable_p.h" +#include "qmlgraphicsflickable_p_p.h" #include <QGraphicsSceneMouseEvent> #include <QPointer> @@ -1287,4 +1287,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QmlGraphicsFlickableVisibleArea) QML_DEFINE_TYPE(Qt,4,6,VisibleArea,QmlGraphicsFlickableVisibleArea) -#include "qmlgraphicsflickable.moc" +#include <qmlgraphicsflickable.moc> |