diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlviewer/proxysettings.h | 1 | ||||
| -rw-r--r-- | tools/qmlviewer/qdeclarativetester.cpp | 2 | ||||
| -rw-r--r-- | tools/qmlviewer/qdeclarativetester.h | 3 | ||||
| -rw-r--r-- | tools/qmlviewer/qmlruntime.cpp | 7 |
4 files changed, 7 insertions, 6 deletions
diff --git a/tools/qmlviewer/proxysettings.h b/tools/qmlviewer/proxysettings.h index 2a9cbb3cb7..322190e989 100644 --- a/tools/qmlviewer/proxysettings.h +++ b/tools/qmlviewer/proxysettings.h @@ -51,7 +51,6 @@ QT_BEGIN_NAMESPACE */ class ProxySettings : public QDialog, public Ui::ProxySettings { - Q_OBJECT public: diff --git a/tools/qmlviewer/qdeclarativetester.cpp b/tools/qmlviewer/qdeclarativetester.cpp index 0a0dea1db2..1a125cdb09 100644 --- a/tools/qmlviewer/qdeclarativetester.cpp +++ b/tools/qmlviewer/qdeclarativetester.cpp @@ -47,8 +47,8 @@ #include <QDeclarativeComponent> #include <QDir> #include <QCryptographicHash> -#include <private/qabstractanimation_p.h> #include <QGraphicsObject> +#include <QtCore/private/qabstractanimation_p.h> #include <QtQuick1/private/qdeclarativeitem_p.h> QT_BEGIN_NAMESPACE diff --git a/tools/qmlviewer/qdeclarativetester.h b/tools/qmlviewer/qdeclarativetester.h index b64813715a..968274c97e 100644 --- a/tools/qmlviewer/qdeclarativetester.h +++ b/tools/qmlviewer/qdeclarativetester.h @@ -50,7 +50,7 @@ #include <qmlruntime.h> #include <qdeclarativelist.h> #include <qdeclarative.h> -#include <QAbstractAnimation> +#include <QtCore/qabstractanimation.h> QT_BEGIN_NAMESPACE @@ -207,6 +207,7 @@ QT_BEGIN_NAMESPACE class QDeclarativeTester : public QAbstractAnimation { + Q_OBJECT public: QDeclarativeTester(const QString &script, QDeclarativeViewer::ScriptOptions options, QDeclarativeView *parent); ~QDeclarativeTester(); diff --git a/tools/qmlviewer/qmlruntime.cpp b/tools/qmlviewer/qmlruntime.cpp index 003e87265a..b0a729d232 100644 --- a/tools/qmlviewer/qmlruntime.cpp +++ b/tools/qmlviewer/qmlruntime.cpp @@ -50,9 +50,6 @@ #include <qdeclarativecontext.h> #include <qdeclarativeengine.h> #include <qdeclarativenetworkaccessmanagerfactory.h> -#include "qdeclarative.h" -#include <QAbstractAnimation> -#include <private/qabstractanimation_p.h> #include <QSettings> #include <QMimeData> @@ -95,6 +92,10 @@ #include <QGLWidget> #endif +#include <qdeclarativetester.h> +#include "qdeclarative.h" +#include "private/qabstractanimation_p.h" + QT_BEGIN_NAMESPACE class DragAndDropView : public QDeclarativeView |