Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

2 files changed, 4 insertions, 10 deletions

diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp
index 185d8e5..c1da692 100644
--- a/src/corelib/animation/qabstractanimation.cpp
+++ b/src/corelib/animation/qabstractanimation.cpp
@@ -205,7 +205,6 @@ void QUnifiedTimer::updateAnimationsTime()
             QAbstractAnimation *animation = animations.at(currentAnimationIdx);
             int elapsed = QAbstractAnimationPrivate::get(animation)->totalCurrentTime
                           + (animation->direction() == QAbstractAnimation::Forward ? delta : -delta);
-            //qWarning() << "SCT" << elapsed;
             animation->setCurrentTime(elapsed);
         }
         currentAnimationIdx = 0;
@@ -232,7 +231,6 @@ void QUnifiedTimer::timerEvent(QTimerEvent *event)
 {
     if ((consistentTiming && startStopAnimationTimer.isActive()) ||
         (event->timerId() == startStopAnimationTimer.timerId())) {
-        //qWarning() << "A SSAT";
         startStopAnimationTimer.stop();
 
         //we transfer the waiting animations into the "really running" state
@@ -254,7 +252,6 @@ void QUnifiedTimer::timerEvent(QTimerEvent *event)
     
     if (event->timerId() == animationTimer.timerId()) {
         // update current time on all top level animations
-        //qWarning() << "A AT";
         updateAnimationsTime();
         restartAnimationTimer();
     }
@@ -267,10 +264,8 @@ void QUnifiedTimer::registerAnimation(QAbstractAnimation *animation, bool isTopL
         Q_ASSERT(!QAbstractAnimationPrivate::get(animation)->hasRegisteredTimer);
         QAbstractAnimationPrivate::get(animation)->hasRegisteredTimer = true;
         animationsToStart << animation;
-        if (!startStopAnimationTimer.isActive()) {
-            //qWarning("Starting SSAT 1");
+        if (!startStopAnimationTimer.isActive())
             startStopAnimationTimer.start(STARTSTOP_TIMER_DELAY, this);
-        }
     }
 }
 
@@ -288,10 +283,8 @@ void QUnifiedTimer::unregisterAnimation(QAbstractAnimation *animation)
         if (idx <= currentAnimationIdx)
             --currentAnimationIdx;
 
-        if (animations.isEmpty() && !startStopAnimationTimer.isActive()) {
-            //qWarning("Starting SSAT 2");
+        if (animations.isEmpty() && !startStopAnimationTimer.isActive())
             startStopAnimationTimer.start(STARTSTOP_TIMER_DELAY, this);
-        }
     } else {
         animationsToStart.removeOne(animation);
     }
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index 1ed6586..b67b4cf 100644
--- a/src/tools/moc/generator.cpp
+++ b/src/tools/moc/generator.cpp
@@ -292,7 +292,8 @@ void Generator::generateCode()
     QList<QByteArray> extraList;
     for (int i = 0; i < cdef->propertyList.count(); ++i) {
         const PropertyDef &p = cdef->propertyList.at(i);
-        if (!isVariantType(p.type) && !metaTypes.contains(p.type)) {
+        if (!isVariantType(p.type) && !metaTypes.contains(p.type) && !p.type.contains('*') &&
+            !p.type.contains('<') && !p.type.contains('>')) {
             int s = p.type.lastIndexOf("::");
             if (s > 0) {
                 QByteArray scope = p.type.left(s);