diff options
| author | Marek Rosa <marek.rosa@digia.com> | 2012-09-14 12:21:27 +0300 |
|---|---|---|
| committer | Marek Rosa <marek.rosa@digia.com> | 2012-09-14 12:21:27 +0300 |
| commit | b660f2141c1820cb460cac441ab16a940605b09d (patch) | |
| tree | 710a7fce2a976161f0e45583fb61ce6aeda7afcb /tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.h | |
| parent | 96f04f377ffa3dbd2762069ab1cf476779d51b39 (diff) | |
Qt5: declarative fix part4
- re-enabled tests
- fixed the include files in tests folder
- fixed QSKIP macro in tests
Diffstat (limited to 'tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.h')
| -rw-r--r-- | tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.h b/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.h index f8008f5c..7f856586 100644 --- a/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.h +++ b/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.h @@ -11,7 +11,11 @@ #ifndef QMLAPPLICATIONVIEWER_H #define QMLAPPLICATIONVIEWER_H -#include <QtDeclarative/QDeclarativeView> +#ifdef QT5_QUICK_1 + #include <QtQuick1/QDeclarativeView> +#else + #include <QtDeclarative/QDeclarativeView> +#endif class QmlApplicationViewer : public QDeclarativeView { @@ -33,7 +37,7 @@ public: void addImportPath(const QString &path); // Note that this will only have an effect on Symbian and Fremantle. - void setOrientation(ScreenOrientation orientation); + // void setOrientation(ScreenOrientation orientation); void showExpanded(); |