diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-04 08:25:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-04 08:25:11 (GMT) |
| commit | 8b610c28c1300e0aa800569225d8512d0b66ffce (patch) | |
| tree | 099f2a89f86bb194a6c6352ce92fee7e877956a2 /src/declarative/qml/qdeclarative.h | |
| parent | ebfe394f21174b2ab1c37e809d2c35eb0de84508 (diff) | |
| parent | 739e705150ad114eb92a1fac34a51d30322ffc31 (diff) | |
| download | Qt-8b610c28c1300e0aa800569225d8512d0b66ffce.zip Qt-8b610c28c1300e0aa800569225d8512d0b66ffce.tar.gz Qt-8b610c28c1300e0aa800569225d8512d0b66ffce.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
QDeclarativeDebug: Fix autotest breakage in qdeclarativedebugjs
Fix assert
Compile fix for Symbian
Debugger: Fix autotest breakage
Debugger: Rename qdeclarativedebug* to qdeclarativeenginedebug*
Rename QDeclarativeEngineDebugServer to ~Service
Fix aliasing bug when compiled with gcc 4.6
Debugger: Move QT_DECLARATIVE_DEBUG handling out of qdeclarative.h
FocusScope's focusItem must always be a descendent
QDeclarativeDebugJs: Disable unstable autotest
Add qdeclarativedebugjs autotests to declarative.pro
tests: Use CONFIG option instead of QDeclarativeDebugHelper class
Diffstat (limited to 'src/declarative/qml/qdeclarative.h')
| -rw-r--r-- | src/declarative/qml/qdeclarative.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h index 5e8d0f4..399c207 100644 --- a/src/declarative/qml/qdeclarative.h +++ b/src/declarative/qml/qdeclarative.h @@ -405,17 +405,6 @@ QObject *qmlAttachedPropertiesObject(const QObject *obj, bool create = true) return qmlAttachedPropertiesObject(&idx, obj, &T::staticMetaObject, create); } -// Enable debugging before any QDeclarativeEngine is created -struct Q_DECLARATIVE_EXPORT QDeclarativeDebuggingEnabler -{ - QDeclarativeDebuggingEnabler(); -}; - -// Execute code in constructor before first QDeclarativeEngine is instantiated -#if defined(QT_DECLARATIVE_DEBUG) -static QDeclarativeDebuggingEnabler qmlEnableDebuggingHelper; -#endif - QT_END_NAMESPACE QML_DECLARE_TYPE(QObject) |