diff options
| author | Marek Rosa <marek.rosa@digia.com> | 2012-09-12 15:21:11 +0300 |
|---|---|---|
| committer | Marek Rosa <marek.rosa@digia.com> | 2012-09-12 15:21:11 +0300 |
| commit | 7140e4975cd30a2f2ec63a86fafd268a55a573b5 (patch) | |
| tree | 3d5d50aad66a696ff8e61662dcb6c8eb15fe9422 /plugins/declarative/declarativecategoryaxis.h | |
| parent | 7cd68cfd66964e17399745e18d62f3cda56614f5 (diff) | |
Qt5: declarative fix part1
- disabled demos examples and tests
- disabled error on warning (QVector compilation issue: warning: dereferencing pointer '<anonymous>' does break strict-aliasing rules
- disabled designer plugin
- fixed the include files in plugins/declarative folder
Diffstat (limited to 'plugins/declarative/declarativecategoryaxis.h')
| -rw-r--r-- | plugins/declarative/declarativecategoryaxis.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/plugins/declarative/declarativecategoryaxis.h b/plugins/declarative/declarativecategoryaxis.h index 7d934a54..f720c976 100644 --- a/plugins/declarative/declarativecategoryaxis.h +++ b/plugins/declarative/declarativecategoryaxis.h @@ -22,8 +22,13 @@ #define DECLARATIVECATEGORYAXIS_H #include "qcategoryaxis.h" -#include <QDeclarativeParserStatus> -#include <QDeclarativeListProperty> +#ifdef QT5_QUICK_1 + #include <QtQuick1/QDeclarativeListProperty> + #include <QtQuick1/QDeclarativeParserStatus> +#else + #include <QtDeclarative/QDeclarativeListProperty> + #include <QtDeclarative/QDeclarativeParserStatus> +#endif QTCOMMERCIALCHART_BEGIN_NAMESPACE |