diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-02 06:15:41 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-02 06:15:41 (GMT) |
| commit | 0549df8e6b43fc6aa3d3750bcd0346344f272fd1 (patch) | |
| tree | 94e532f2e3018aaf7b01b896e255b2376aa626b3 /src/declarative/qml/qmlvme.cpp | |
| parent | 49bceaf197a5964f244ac094aaa75b35cf3ada49 (diff) | |
| parent | c84fefd59090c0d0f757572fe14b493d94759808 (diff) | |
| download | Qt-0549df8e6b43fc6aa3d3750bcd0346344f272fd1.zip Qt-0549df8e6b43fc6aa3d3750bcd0346344f272fd1.tar.gz Qt-0549df8e6b43fc6aa3d3750bcd0346344f272fd1.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlvme.cpp')
| -rw-r--r-- | src/declarative/qml/qmlvme.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp index 0f49e1e..0d88e02 100644 --- a/src/declarative/qml/qmlvme.cpp +++ b/src/declarative/qml/qmlvme.cpp @@ -40,14 +40,13 @@ ****************************************************************************/ #include "qmlvme_p.h" -#include <qfxperf.h> +#include <private/qfxperf_p.h> #include <private/qmlboundsignal_p.h> #include <private/qmlstringconverters_p.h> #include "private/qmetaobjectbuilder_p.h" #include "private/qmldeclarativedata_p.h" #include <qml.h> #include <private/qmlcustomparser_p.h> -#include <qperformancelog.h> #include <QStack> #include <QWidget> #include <private/qmlcompiledcomponent_p.h> |