diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2011-08-31 08:01:19 (GMT) |
|---|---|---|
| committer | Kai Koehne <kai.koehne@nokia.com> | 2011-09-15 07:11:40 (GMT) |
| commit | 22ef6f15102cd287bd3cdbc9fe723d22b35560ca (patch) | |
| tree | d71ffb26e7ee3b22a948dc8051be9544bf91c7c0 /src/declarative/qml | |
| parent | 52a4415f29245d816901d7fec15982a9e746c097 (diff) | |
| download | Qt-22ef6f15102cd287bd3cdbc9fe723d22b35560ca.zip Qt-22ef6f15102cd287bd3cdbc9fe723d22b35560ca.tar.gz Qt-22ef6f15102cd287bd3cdbc9fe723d22b35560ca.tar.bz2 | |
Debugger: Move QT_DECLARATIVE_DEBUG handling out of qdeclarative.h
Apps don't have to (directly or indirectly) include qdeclarative.h.
Instead, move the static instance to qdeclarativeengine.h, and
qdeclarativeview.h (which instantiates it's own engine).
Change-Id: I8b3e63ad4f134969734a2cc712395145d90e0dfa
Reviewed-on: http://codereview.qt.nokia.com/3941
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
(cherrypicked from commit 6cb39fb829b78b5f6e9751283c7cd50400821e2a)
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/qdeclarative.h | 11 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.h | 1 |
2 files changed, 1 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) diff --git a/src/declarative/qml/qdeclarativeengine.h b/src/declarative/qml/qdeclarativeengine.h index 61ab2b2..4d6887f 100644 --- a/src/declarative/qml/qdeclarativeengine.h +++ b/src/declarative/qml/qdeclarativeengine.h @@ -47,6 +47,7 @@ #include <QtCore/qmap.h> #include <QtScript/qscriptvalue.h> #include <QtDeclarative/qdeclarativeerror.h> +#include <QtDeclarative/qdeclarativedebug.h> QT_BEGIN_HEADER |