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 | |
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')
-rw-r--r-- | plugins/declarative/declarativebarseries.h | 9 | ||||
-rw-r--r-- | plugins/declarative/declarativecategoryaxis.h | 9 | ||||
-rw-r--r-- | plugins/declarative/declarativechart.h | 6 | ||||
-rw-r--r-- | plugins/declarative/declarativelineseries.h | 9 | ||||
-rw-r--r-- | plugins/declarative/declarativepieseries.h | 9 | ||||
-rw-r--r-- | plugins/declarative/declarativescatterseries.h | 9 | ||||
-rw-r--r-- | plugins/declarative/declarativesplineseries.h | 9 | ||||
-rw-r--r-- | plugins/declarative/plugin.cpp | 18 | ||||
-rw-r--r-- | plugins/plugins.pro | 4 |
9 files changed, 64 insertions, 18 deletions
diff --git a/plugins/declarative/declarativebarseries.h b/plugins/declarative/declarativebarseries.h index 62060895..8c4599ad 100644 --- a/plugins/declarative/declarativebarseries.h +++ b/plugins/declarative/declarativebarseries.h @@ -28,8 +28,13 @@ #include "qhorizontalstackedbarseries.h" #include "qhorizontalpercentbarseries.h" #include "qbarset.h" -#include <QDeclarativeItem> -#include <QDeclarativeParserStatus> +#ifdef QT5_QUICK_1 + #include <QtQuick1/QDeclarativeItem> + #include <QtQuick1/QDeclarativeParserStatus> +#else + #include <QtDeclarative/QDeclarativeItem> + #include <QtDeclarative/QDeclarativeParserStatus> +#endif QTCOMMERCIALCHART_BEGIN_NAMESPACE 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 diff --git a/plugins/declarative/declarativechart.h b/plugins/declarative/declarativechart.h index a20a6cc8..f0076fff 100644 --- a/plugins/declarative/declarativechart.h +++ b/plugins/declarative/declarativechart.h @@ -22,7 +22,11 @@ #define DECLARATIVECHART_H #include <QtCore/QtGlobal> -#include <QDeclarativeItem> +#ifdef QT5_QUICK_1 + #include <QtQuick1/QDeclarativeItem> +#else + #include <QtDeclarative/QDeclarativeItem> +#endif #include "qchart.h" QTCOMMERCIALCHART_BEGIN_NAMESPACE diff --git a/plugins/declarative/declarativelineseries.h b/plugins/declarative/declarativelineseries.h index 698047fb..3365000e 100644 --- a/plugins/declarative/declarativelineseries.h +++ b/plugins/declarative/declarativelineseries.h @@ -23,8 +23,13 @@ #include "qlineseries.h" #include "declarativexyseries.h" -#include <QDeclarativeListProperty> -#include <QDeclarativeParserStatus> +#ifdef QT5_QUICK_1 + #include <QtQuick1/QDeclarativeListProperty> + #include <QtQuick1/QDeclarativeParserStatus> +#else + #include <QtDeclarative/QDeclarativeListProperty> + #include <QtDeclarative/QDeclarativeParserStatus> +#endif QTCOMMERCIALCHART_BEGIN_NAMESPACE diff --git a/plugins/declarative/declarativepieseries.h b/plugins/declarative/declarativepieseries.h index 3a26bb6a..5a7d5cbe 100644 --- a/plugins/declarative/declarativepieseries.h +++ b/plugins/declarative/declarativepieseries.h @@ -22,8 +22,13 @@ #define DECLARATIVEPIESERIES_H #include "qpieseries.h" -#include <QDeclarativeItem> -#include <QDeclarativeParserStatus> +#ifdef QT5_QUICK_1 + #include <QtQuick1/QDeclarativeItem> + #include <QtQuick1/QDeclarativeParserStatus> +#else + #include <QtDeclarative/QDeclarativeItem> + #include <QtDeclarative/QDeclarativeParserStatus> +#endif QTCOMMERCIALCHART_BEGIN_NAMESPACE class QPieSlice; diff --git a/plugins/declarative/declarativescatterseries.h b/plugins/declarative/declarativescatterseries.h index ea28ecbe..4188f2f4 100644 --- a/plugins/declarative/declarativescatterseries.h +++ b/plugins/declarative/declarativescatterseries.h @@ -23,8 +23,13 @@ #include "qscatterseries.h" #include "declarativexyseries.h" -#include <QDeclarativeListProperty> -#include <QDeclarativeParserStatus> +#ifdef QT5_QUICK_1 + #include <QtQuick1/QDeclarativeListProperty> + #include <QtQuick1/QDeclarativeParserStatus> +#else + #include <QtDeclarative/QDeclarativeListProperty> + #include <QtDeclarative/QDeclarativeParserStatus> +#endif QTCOMMERCIALCHART_BEGIN_NAMESPACE diff --git a/plugins/declarative/declarativesplineseries.h b/plugins/declarative/declarativesplineseries.h index 9ac5b7a5..6c198d16 100644 --- a/plugins/declarative/declarativesplineseries.h +++ b/plugins/declarative/declarativesplineseries.h @@ -23,8 +23,13 @@ #include "qsplineseries.h" #include "declarativexyseries.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 diff --git a/plugins/declarative/plugin.cpp b/plugins/declarative/plugin.cpp index 9a6861f5..9ee067d1 100644 --- a/plugins/declarative/plugin.cpp +++ b/plugins/declarative/plugin.cpp @@ -18,8 +18,13 @@ ** ****************************************************************************/ -#include <QtDeclarative/qdeclarativeextensionplugin.h> -#include <QtDeclarative/qdeclarative.h> +#ifdef QT5_QUICK_1 + #include <QtQuick1/qdeclarativeextensionplugin.h> + #include <QtQuick1/qdeclarative.h> +#else + #include <QtDeclarative/qdeclarativeextensionplugin.h> + #include <QtDeclarative/qdeclarative.h> +#endif #include "qchart.h" #include "qabstractaxis.h" #include "qvalueaxis.h" @@ -51,6 +56,11 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE class ChartQmlPlugin : public QDeclarativeExtensionPlugin { Q_OBJECT + +#ifdef QT5_QUICK_1 + Q_PLUGIN_METADATA(IID "org.qt-project.foo") +#endif + public: virtual void registerTypes(const char *uri) { @@ -162,4 +172,6 @@ QTCOMMERCIALCHART_END_NAMESPACE QTCOMMERCIALCHART_USE_NAMESPACE -Q_EXPORT_PLUGIN2(qtcommercialchartqml, QT_PREPEND_NAMESPACE(ChartQmlPlugin)) +#ifndef QT5_QUICK_1 + Q_EXPORT_PLUGIN2(qtcommercialchartqml, QT_PREPEND_NAMESPACE(ChartQmlPlugin)) +#endif diff --git a/plugins/plugins.pro b/plugins/plugins.pro index 1fd7a9bb..fc5cf270 100644 --- a/plugins/plugins.pro +++ b/plugins/plugins.pro @@ -11,6 +11,6 @@ contains(QT_VERSION, ^4\\.[0-7]\\.[0-3]\\s*$) | contains(QT_VERSION, ^4\\.[0-6]\ } !linux-arm*: { - SUBDIRS += \ - designer +# SUBDIRS += \ +# designer } |