diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-07-10 01:17:51 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-07-10 01:17:51 (GMT) |
| commit | 9c13caa3c99af01a9b4c3ff6e178e7dadb61741f (patch) | |
| tree | b69df0a23c4628359fc3740e09958980eda7478e /tools/qmlviewer | |
| parent | bb1bdcab28e4c52dcea37dfaaa435045b1985eeb (diff) | |
| parent | 883da42f7c75775502c818aa456c8576d8457ff8 (diff) | |
| download | Qt-9c13caa3c99af01a9b4c3ff6e178e7dadb61741f.zip Qt-9c13caa3c99af01a9b4c3ff6e178e7dadb61741f.tar.gz Qt-9c13caa3c99af01a9b4c3ff6e178e7dadb61741f.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv
Conflicts:
examples/itemviews/frozencolumn/main.cpp
src/declarative/canvas/qsimplecanvas.cpp
src/declarative/canvas/qsimplecanvas_p.h
src/declarative/canvas/qsimplecanvasitem.h
src/declarative/extra/qfxparticles.cpp
src/declarative/fx/fx.pri
src/declarative/fx/qfxblurfilter.h
src/declarative/fx/qfxcontentwrapper.cpp
src/declarative/fx/qfxflickable.cpp
src/declarative/fx/qfxfocuspanel.h
src/declarative/fx/qfxfocusrealm.h
src/declarative/fx/qfxhighlightfilter.cpp
src/declarative/fx/qfxhighlightfilter.h
src/declarative/fx/qfximage.cpp
src/declarative/fx/qfxitem.cpp
src/declarative/fx/qfxitem.h
src/declarative/fx/qfxrect.cpp
src/declarative/fx/qfxreflectionfilter.h
src/declarative/fx/qfxshadowfilter.cpp
src/declarative/fx/qfxshadowfilter.h
src/declarative/fx/qfxtext.cpp
src/declarative/fx/qfxtext.h
src/declarative/fx/qfxtextedit.cpp
src/declarative/opengl/glbasicshaders.h
src/declarative/test/qfxtestengine.cpp
src/declarative/test/qfxtestengine.h
src/declarative/test/qfxtestobjects.cpp
src/declarative/test/qfxtestobjects.h
src/declarative/test/qfxtestview.h
src/declarative/util/qfxglobal.h
src/declarative/util/qfxview.cpp
src/gui/graphicsview/qgraphicsitem_p.h
tools/qmlviewer/qmlviewer.cpp
Diffstat (limited to 'tools/qmlviewer')
| -rw-r--r-- | tools/qmlviewer/qmlviewer.cpp | 6 | ||||
| -rw-r--r-- | tools/qmlviewer/qmlviewer.h | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp index 19866cc..d489412 100644 --- a/tools/qmlviewer/qmlviewer.cpp +++ b/tools/qmlviewer/qmlviewer.cpp @@ -18,7 +18,7 @@ #include <QtDeclarative/qmlcontext.h> #include <QtDeclarative/qmlengine.h> #include "qml.h" -#include "qperformancelog.h" +#include <private/qperformancelog_p.h> #include "deviceskin.h" #include <QNetworkDiskCache> @@ -41,6 +41,8 @@ #include <QNetworkProxyFactory> #include <QKeyEvent> +QT_BEGIN_NAMESPACE + class PreviewDeviceSkin : public DeviceSkin { Q_OBJECT @@ -699,4 +701,6 @@ void QmlViewer::setCacheEnabled(bool on) } } +QT_END_NAMESPACE + #include "qmlviewer.moc" diff --git a/tools/qmlviewer/qmlviewer.h b/tools/qmlviewer/qmlviewer.h index 22f07a0..c46f185 100644 --- a/tools/qmlviewer/qmlviewer.h +++ b/tools/qmlviewer/qmlviewer.h @@ -19,6 +19,7 @@ #include <QTime> #include <QList> +QT_BEGIN_NAMESPACE class QFxView; class PreviewDeviceSkin; @@ -90,4 +91,6 @@ private: mutable QMenuBar *mb; }; +QT_END_NAMESPACE + #endif |