diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-12-04 01:57:05 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-12-04 01:57:05 (GMT) |
| commit | c37cdb5a8e8eea672fa59a3cb427b74d6a928a30 (patch) | |
| tree | 89dde1623a991a24a9287de1e6ed4ea3bece103e /src/declarative/qml/qmlwatcher.cpp | |
| parent | 261c8600253ad17f41c3b4830b9086a8a034fa4a (diff) | |
| parent | b664d980f4c3b6fb379d68e54b6087b83a4c26b0 (diff) | |
| download | Qt-c37cdb5a8e8eea672fa59a3cb427b74d6a928a30.zip Qt-c37cdb5a8e8eea672fa59a3cb427b74d6a928a30.tar.gz Qt-c37cdb5a8e8eea672fa59a3cb427b74d6a928a30.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlwatcher.cpp')
| -rw-r--r-- | src/declarative/qml/qmlwatcher.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/declarative/qml/qmlwatcher.cpp b/src/declarative/qml/qmlwatcher.cpp index 889ac78..507c11d 100644 --- a/src/declarative/qml/qmlwatcher.cpp +++ b/src/declarative/qml/qmlwatcher.cpp @@ -39,14 +39,16 @@ ** ****************************************************************************/ +#include "qmlwatcher_p.h" + +#include "qmlexpression.h" +#include "qmlcontext.h" +#include "qml.h" + +#include <qmldebugservice_p.h> + #include <QtCore/qmetaobject.h> #include <QtCore/qdebug.h> -#include <qmlexpression.h> -#include <private/qmldebugservice_p.h> -#include <qmlcontext.h> -#include <qml.h> - -#include "qmlwatcher_p.h" QT_BEGIN_NAMESPACE @@ -180,4 +182,4 @@ void QmlWatcher::addPropertyWatch(int id, QObject *object, quint32 debugId, cons QT_END_NAMESPACE -#include "qmlwatcher.moc" +#include <qmlwatcher.moc> |