diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-04-22 06:55:04 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-04-22 06:55:04 (GMT) |
commit | a1458a0426caa71bab4527ca079c3004bb2b5abd (patch) | |
tree | f66a911fbc093fd40e5c2f13cdb241149d9c4d4b | |
parent | bef4438eea6fc44ef81c63772e10d2390586d16c (diff) | |
download | Qt-a1458a0426caa71bab4527ca079c3004bb2b5abd.zip Qt-a1458a0426caa71bab4527ca079c3004bb2b5abd.tar.gz Qt-a1458a0426caa71bab4527ca079c3004bb2b5abd.tar.bz2 |
Make compile
I've temporarily commented out the body of qguivariantanimation.cpp so we can compile.
-rw-r--r-- | src/declarative/util/qmlanimation.cpp | 4 | ||||
-rw-r--r-- | src/gui/animation/qguivariantanimation.cpp | 4 | ||||
-rw-r--r-- | src/opengl/opengl.pro | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp index 803f2b2..729d53a 100644 --- a/src/declarative/util/qmlanimation.cpp +++ b/src/declarative/util/qmlanimation.cpp @@ -323,8 +323,8 @@ void QmlAbstractAnimation::setRepeat(bool r) return; d->repeat = r; - int ic = r ? -1 : 1; - qtAnimation()->setIterationCount(ic); + int lc = r ? -1 : 1; + qtAnimation()->setLoopCount(lc); emit repeatChanged(r); } diff --git a/src/gui/animation/qguivariantanimation.cpp b/src/gui/animation/qguivariantanimation.cpp index 46ba251..fab377a 100644 --- a/src/gui/animation/qguivariantanimation.cpp +++ b/src/gui/animation/qguivariantanimation.cpp @@ -41,7 +41,7 @@ #ifndef QT_NO_ANIMATION -QT_BEGIN_NAMESPACE +/*QT_BEGIN_NAMESPACE #ifdef QT_EXPERIMENTAL_SOLUTION # include "qvariantanimation.h" @@ -74,6 +74,6 @@ static int qUnregisterGuiGetInterpolator() } Q_DESTRUCTOR_FUNCTION(qUnregisterGuiGetInterpolator) -QT_END_NAMESPACE +QT_END_NAMESPACE*/ #endif //QT_NO_ANIMATION diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index f9fa0d0..ad75a5f 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -25,7 +25,6 @@ HEADERS += qgl.h \ qglcolormap.h \ qglpixelbuffer.h \ qglframebufferobject.h \ - qglpixmapfilter_p.h \ qglshaderprogram.h SOURCES += qgl.cpp \ @@ -33,11 +32,10 @@ SOURCES += qgl.cpp \ qglpixelbuffer.cpp \ qglframebufferobject.cpp \ qglextensions.cpp \ - qglpixmapfilter.cpp \ qglshaderprogram.cpp !contains(QT_CONFIG, opengles2) { - HEADERS += qpaintengine_opengl_p.h qglpixmapfilter_p.h + HEADERS += qpaintengine_opengl_p.h qglpixmapfilter_p.h SOURCES += qpaintengine_opengl.cpp qglpixmapfilter.cpp } |