diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2010-05-31 13:11:57 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2010-05-31 13:12:40 (GMT) |
| commit | 77474ad850b91e1de080d2f8fb9a60af2f89668f (patch) | |
| tree | 0c1412a7b36cd1e0d919d2d4e2bea3c0ae113177 /src/declarative/util | |
| parent | cbff8db322bf8e99cb3e062cc47fd2fc0db81ac2 (diff) | |
| download | Qt-77474ad850b91e1de080d2f8fb9a60af2f89668f.zip Qt-77474ad850b91e1de080d2f8fb9a60af2f89668f.tar.gz Qt-77474ad850b91e1de080d2f8fb9a60af2f89668f.tar.bz2 | |
Fix QT_NO_TEXTSTREAM compilation errors.
Merge-request: 647
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qdeclarativestate.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/util/qdeclarativetransitionmanager.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp index b5f7900..dc2b2cc 100644 --- a/src/declarative/util/qdeclarativestate.cpp +++ b/src/declarative/util/qdeclarativestate.cpp @@ -486,6 +486,7 @@ void QDeclarativeState::apply(QDeclarativeStateGroup *group, QDeclarativeTransit // All the local reverts now become part of the ongoing revertList d->revertList << additionalReverts; +#ifndef QT_NO_DEBUG_STREAM // Output for debugging if (stateChangeDebug()) { foreach(const QDeclarativeAction &action, applyList) { @@ -497,6 +498,7 @@ void QDeclarativeState::apply(QDeclarativeStateGroup *group, QDeclarativeTransit << "To:" << action.toValue; } } +#endif d->transitionManager.transition(applyList, trans); } diff --git a/src/declarative/util/qdeclarativetransitionmanager.cpp b/src/declarative/util/qdeclarativetransitionmanager.cpp index 368d484..9f198e4 100644 --- a/src/declarative/util/qdeclarativetransitionmanager.cpp +++ b/src/declarative/util/qdeclarativetransitionmanager.cpp @@ -233,6 +233,7 @@ void QDeclarativeTransitionManager::transition(const QList<QDeclarativeAction> & action.property.write(action.toValue); } } +#ifndef QT_NO_DEBUG_STREAM if (stateChangeDebug()) { foreach(const QDeclarativeAction &action, applyList) { if (action.event) @@ -243,6 +244,7 @@ void QDeclarativeTransitionManager::transition(const QList<QDeclarativeAction> & << "To:" << action.toValue; } } +#endif if (!transition) d->applyBindings(); } |