diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-06-10 12:34:54 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-06-10 12:34:54 (GMT) |
| commit | d8a284783b56e2ddbcedff3fc9577ec6038aab57 (patch) | |
| tree | 1d49be6cb7de25836957adf30ac113c3a0499911 /src/declarative/fx/qfxfocuspanel.h | |
| parent | 4a6548b83a6f1df42b82664efaca26c7efbc1909 (diff) | |
| parent | c0bbe44ab6290dee088138c01724779026d2c033 (diff) | |
| download | Qt-d8a284783b56e2ddbcedff3fc9577ec6038aab57.zip Qt-d8a284783b56e2ddbcedff3fc9577ec6038aab57.tar.gz Qt-d8a284783b56e2ddbcedff3fc9577ec6038aab57.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/corelib/animation/qanimationgroup.cpp
src/gui/graphicsview/qgraphicsitem.cpp
Diffstat (limited to 'src/declarative/fx/qfxfocuspanel.h')
| -rw-r--r-- | src/declarative/fx/qfxfocuspanel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/fx/qfxfocuspanel.h b/src/declarative/fx/qfxfocuspanel.h index 38f7a15..60f9118 100644 --- a/src/declarative/fx/qfxfocuspanel.h +++ b/src/declarative/fx/qfxfocuspanel.h @@ -42,7 +42,7 @@ #ifndef QFXFOCUSPANEL_H #define QFXFOCUSPANEL_H -#include <qfxitem.h> +#include <QtDeclarative/qfxitem.h> QT_BEGIN_HEADER @@ -72,7 +72,7 @@ private: Q_DISABLE_COPY(QFxFocusPanel) }; -QML_DECLARE_TYPE(QFxFocusPanel); +QML_DECLARE_TYPE(QFxFocusPanel) QT_END_NAMESPACE |