diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-27 23:25:07 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-27 23:25:07 (GMT) |
| commit | fb2e33b21557412ae7bde009662ca89870407f5f (patch) | |
| tree | 61e7765a4e644d12a0addc21a0bf63e13e992cb9 /examples/animation/sub-attaq/boat_p.h | |
| parent | d53e4499f864719446abdb7fdeff433dbb3f7d98 (diff) | |
| parent | fcfdccc03b6dd26a82e87a6b6a0ca48d67f78cf6 (diff) | |
| download | Qt-fb2e33b21557412ae7bde009662ca89870407f5f.zip Qt-fb2e33b21557412ae7bde009662ca89870407f5f.tar.gz Qt-fb2e33b21557412ae7bde009662ca89870407f5f.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
mkspecs/features/qt.prf
src/corelib/animation/qanimationgroup.cpp
src/corelib/animation/qparallelanimationgroup.cpp
src/corelib/animation/qpauseanimation.cpp
src/corelib/animation/qpropertyanimation.cpp
src/corelib/animation/qsequentialanimationgroup.cpp
src/corelib/kernel/kernel.pri
src/corelib/kernel/qvariant_p.h
src/corelib/tools/qeasingcurve.cpp
src/gui/graphicsview/qgraphicsitem.cpp
src/opengl/opengl.pro
src/opengl/qgl_x11egl.cpp
tests/auto/auto.pro
Diffstat (limited to 'examples/animation/sub-attaq/boat_p.h')
| -rw-r--r-- | examples/animation/sub-attaq/boat_p.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/examples/animation/sub-attaq/boat_p.h b/examples/animation/sub-attaq/boat_p.h index 6f03e48..a8a24a6 100644 --- a/examples/animation/sub-attaq/boat_p.h +++ b/examples/animation/sub-attaq/boat_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Qt Software Information (qt-info@nokia.com) ** -** This file is part of the QtCore module of the Qt Toolkit. +** This file is part of the examples of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -42,16 +42,23 @@ #ifndef BOAT_P_H #define BOAT_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + //Own #include "bomb.h" #include "graphicsscene.h" // Qt -#if defined(QT_EXPERIMENTAL_SOLUTION) -# include "qkeyeventtransition.h" -#else -# include <QtGui/QKeyEventTransition> -#endif +#include <QtGui/QKeyEventTransition> static const int MAX_BOMB = 5; |