diff options
| author | Jani Honkonen <jani.honkonen@digia.com> | 2012-11-08 15:51:22 +0200 |
|---|---|---|
| committer | Jani Honkonen <jani.honkonen@digia.com> | 2012-11-08 15:54:57 +0200 |
| commit | c28e9eaa694f435f3e36ffecb1a7250d918f86d5 (patch) | |
| tree | 46fdeb2aea0bd49b3768001c32d51e1544cf96f1 /tests/qmlchartaxis | |
| parent | a4f56d6d94a1703df34c4ae60a8cbc58b761f30b (diff) | |
Fixing qml build for latest Qt5
There is no quick1 module anymore. It is (again) called a declarative module.
Diffstat (limited to 'tests/qmlchartaxis')
3 files changed, 5 insertions, 19 deletions
diff --git a/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.cpp b/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.cpp index 05ba5a39..efbf1e37 100644 --- a/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -12,15 +12,9 @@ #include <QtCore/QDir> #include <QtCore/QFileInfo> -#ifdef QT5_QUICK_1 - #include <QtQuick1/QDeclarativeComponent> - #include <QtQuick1/QDeclarativeEngine> - #include <QtQuick1/QDeclarativeContext> -#else - #include <QtDeclarative/QDeclarativeComponent> - #include <QtDeclarative/QDeclarativeEngine> - #include <QtDeclarative/QDeclarativeContext> -#endif +#include <QtDeclarative/QDeclarativeComponent> +#include <QtDeclarative/QDeclarativeEngine> +#include <QtDeclarative/QDeclarativeContext> #include <QApplication> #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN diff --git a/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.h b/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.h index 7f856586..9d0fea29 100644 --- a/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.h +++ b/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.h @@ -11,11 +11,7 @@ #ifndef QMLAPPLICATIONVIEWER_H #define QMLAPPLICATIONVIEWER_H -#ifdef QT5_QUICK_1 - #include <QtQuick1/QDeclarativeView> -#else - #include <QtDeclarative/QDeclarativeView> -#endif +#include <QtDeclarative/QDeclarativeView> class QmlApplicationViewer : public QDeclarativeView { diff --git a/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.pri b/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.pri index 830526b7..567c6dc6 100644 --- a/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.pri @@ -1,8 +1,4 @@ -greaterThan(QT_MAJOR_VERSION, 4) { - QT += quick1 -} else { - QT += declarative -} +QT += declarative SOURCES += $$PWD/qmlapplicationviewer.cpp HEADERS += $$PWD/qmlapplicationviewer.h |