##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Qt5: declarative fix part1...
Marek Rosa -
r2052:7140e4975cd3
parent child
Show More
Side by Side Unified
Context file:
r2052:7140e4975cd3 Loading diff...:
Show file before | Show file after | Hide comments
@@ -3,7 +3,8
3 }
3 }
4
4
5 TEMPLATE = subdirs
5 TEMPLATE = subdirs
6 SUBDIRS = src plugins examples demos tests
6 SUBDIRS = src plugins
7 #examples demos tests
7
8
8 development_build: message('Development build')
9 development_build: message('Development build')
9
10
Show file before | Show file after | Hide comments
@@ -85,6 +85,8 linux-arm*: {
85 DEFINES+=QT_ON_ARM
85 DEFINES+=QT_ON_ARM
86 }
86 }
87
87
88 greaterThan(QT_MAJOR_VERSION, 4): DEFINES += QT5_QUICK_1
89
88 ##################### INCLUDES ############################################################
90 ##################### INCLUDES ############################################################
89
91
90
92
Show file before | Show file after | Hide comments
@@ -28,8 +28,13
28 #include "qhorizontalstackedbarseries.h"
28 #include "qhorizontalstackedbarseries.h"
29 #include "qhorizontalpercentbarseries.h"
29 #include "qhorizontalpercentbarseries.h"
30 #include "qbarset.h"
30 #include "qbarset.h"
31 #include <QDeclarativeItem>
31 #ifdef QT5_QUICK_1
32 #include <QDeclarativeParserStatus>
32 #include <QtQuick1/QDeclarativeItem>
33 #include <QtQuick1/QDeclarativeParserStatus>
34 #else
35 #include <QtDeclarative/QDeclarativeItem>
36 #include <QtDeclarative/QDeclarativeParserStatus>
37 #endif
33
38
34 QTCOMMERCIALCHART_BEGIN_NAMESPACE
39 QTCOMMERCIALCHART_BEGIN_NAMESPACE
35
40
Show file before | Show file after | Hide comments
@@ -22,8 +22,13
22 #define DECLARATIVECATEGORYAXIS_H
22 #define DECLARATIVECATEGORYAXIS_H
23
23
24 #include "qcategoryaxis.h"
24 #include "qcategoryaxis.h"
25 #include <QDeclarativeParserStatus>
25 #ifdef QT5_QUICK_1
26 #include <QDeclarativeListProperty>
26 #include <QtQuick1/QDeclarativeListProperty>
27 #include <QtQuick1/QDeclarativeParserStatus>
28 #else
29 #include <QtDeclarative/QDeclarativeListProperty>
30 #include <QtDeclarative/QDeclarativeParserStatus>
31 #endif
27
32
28 QTCOMMERCIALCHART_BEGIN_NAMESPACE
33 QTCOMMERCIALCHART_BEGIN_NAMESPACE
29
34
Show file before | Show file after | Hide comments
@@ -22,7 +22,11
22 #define DECLARATIVECHART_H
22 #define DECLARATIVECHART_H
23
23
24 #include <QtCore/QtGlobal>
24 #include <QtCore/QtGlobal>
25 #include <QDeclarativeItem>
25 #ifdef QT5_QUICK_1
26 #include <QtQuick1/QDeclarativeItem>
27 #else
28 #include <QtDeclarative/QDeclarativeItem>
29 #endif
26 #include "qchart.h"
30 #include "qchart.h"
27
31
28 QTCOMMERCIALCHART_BEGIN_NAMESPACE
32 QTCOMMERCIALCHART_BEGIN_NAMESPACE
Show file before | Show file after | Hide comments
@@ -23,8 +23,13
23
23
24 #include "qlineseries.h"
24 #include "qlineseries.h"
25 #include "declarativexyseries.h"
25 #include "declarativexyseries.h"
26 #include <QDeclarativeListProperty>
26 #ifdef QT5_QUICK_1
27 #include <QDeclarativeParserStatus>
27 #include <QtQuick1/QDeclarativeListProperty>
28 #include <QtQuick1/QDeclarativeParserStatus>
29 #else
30 #include <QtDeclarative/QDeclarativeListProperty>
31 #include <QtDeclarative/QDeclarativeParserStatus>
32 #endif
28
33
29 QTCOMMERCIALCHART_BEGIN_NAMESPACE
34 QTCOMMERCIALCHART_BEGIN_NAMESPACE
30
35
Show file before | Show file after | Hide comments
@@ -22,8 +22,13
22 #define DECLARATIVEPIESERIES_H
22 #define DECLARATIVEPIESERIES_H
23
23
24 #include "qpieseries.h"
24 #include "qpieseries.h"
25 #include <QDeclarativeItem>
25 #ifdef QT5_QUICK_1
26 #include <QDeclarativeParserStatus>
26 #include <QtQuick1/QDeclarativeItem>
27 #include <QtQuick1/QDeclarativeParserStatus>
28 #else
29 #include <QtDeclarative/QDeclarativeItem>
30 #include <QtDeclarative/QDeclarativeParserStatus>
31 #endif
27
32
28 QTCOMMERCIALCHART_BEGIN_NAMESPACE
33 QTCOMMERCIALCHART_BEGIN_NAMESPACE
29 class QPieSlice;
34 class QPieSlice;
Show file before | Show file after | Hide comments
@@ -23,8 +23,13
23
23
24 #include "qscatterseries.h"
24 #include "qscatterseries.h"
25 #include "declarativexyseries.h"
25 #include "declarativexyseries.h"
26 #include <QDeclarativeListProperty>
26 #ifdef QT5_QUICK_1
27 #include <QDeclarativeParserStatus>
27 #include <QtQuick1/QDeclarativeListProperty>
28 #include <QtQuick1/QDeclarativeParserStatus>
29 #else
30 #include <QtDeclarative/QDeclarativeListProperty>
31 #include <QtDeclarative/QDeclarativeParserStatus>
32 #endif
28
33
29 QTCOMMERCIALCHART_BEGIN_NAMESPACE
34 QTCOMMERCIALCHART_BEGIN_NAMESPACE
30
35
Show file before | Show file after | Hide comments
@@ -23,8 +23,13
23
23
24 #include "qsplineseries.h"
24 #include "qsplineseries.h"
25 #include "declarativexyseries.h"
25 #include "declarativexyseries.h"
26 #include <QDeclarativeParserStatus>
26 #ifdef QT5_QUICK_1
27 #include <QDeclarativeListProperty>
27 #include <QtQuick1/QDeclarativeListProperty>
28 #include <QtQuick1/QDeclarativeParserStatus>
29 #else
30 #include <QtDeclarative/QDeclarativeListProperty>
31 #include <QtDeclarative/QDeclarativeParserStatus>
32 #endif
28
33
29 QTCOMMERCIALCHART_BEGIN_NAMESPACE
34 QTCOMMERCIALCHART_BEGIN_NAMESPACE
30
35
Show file before | Show file after | Hide comments
@@ -18,8 +18,13
18 **
18 **
19 ****************************************************************************/
19 ****************************************************************************/
20
20
21 #include <QtDeclarative/qdeclarativeextensionplugin.h>
21 #ifdef QT5_QUICK_1
22 #include <QtDeclarative/qdeclarative.h>
22 #include <QtQuick1/qdeclarativeextensionplugin.h>
23 #include <QtQuick1/qdeclarative.h>
24 #else
25 #include <QtDeclarative/qdeclarativeextensionplugin.h>
26 #include <QtDeclarative/qdeclarative.h>
27 #endif
23 #include "qchart.h"
28 #include "qchart.h"
24 #include "qabstractaxis.h"
29 #include "qabstractaxis.h"
25 #include "qvalueaxis.h"
30 #include "qvalueaxis.h"
@@ -51,6 +56,11 QTCOMMERCIALCHART_BEGIN_NAMESPACE
51 class ChartQmlPlugin : public QDeclarativeExtensionPlugin
56 class ChartQmlPlugin : public QDeclarativeExtensionPlugin
52 {
57 {
53 Q_OBJECT
58 Q_OBJECT
59
60 #ifdef QT5_QUICK_1
61 Q_PLUGIN_METADATA(IID "org.qt-project.foo")
62 #endif
63
54 public:
64 public:
55 virtual void registerTypes(const char *uri)
65 virtual void registerTypes(const char *uri)
56 {
66 {
@@ -162,4 +172,6 QTCOMMERCIALCHART_END_NAMESPACE
162
172
163 QTCOMMERCIALCHART_USE_NAMESPACE
173 QTCOMMERCIALCHART_USE_NAMESPACE
164
174
165 Q_EXPORT_PLUGIN2(qtcommercialchartqml, QT_PREPEND_NAMESPACE(ChartQmlPlugin))
175 #ifndef QT5_QUICK_1
176 Q_EXPORT_PLUGIN2(qtcommercialchartqml, QT_PREPEND_NAMESPACE(ChartQmlPlugin))
177 #endif
Show file before | Show file after | Hide comments
@@ -11,6 +11,6 contains(QT_VERSION, ^4\\.[0-7]\\.[0-3]\\s*$) | contains(QT_VERSION, ^4\\.[0-6]\
11 }
11 }
12
12
13 !linux-arm*: {
13 !linux-arm*: {
14 SUBDIRS += \
14 # SUBDIRS += \
15 designer
15 # designer
16 }
16 }
Show file before | Show file after | Hide comments
@@ -13,7 +13,7 win32:CONFIG += create_prl
13 win32-msvc*: {
13 win32-msvc*: {
14 QMAKE_CXXFLAGS += /WX
14 QMAKE_CXXFLAGS += /WX
15 } else {
15 } else {
16 QMAKE_CXXFLAGS += -Werror
16 # QMAKE_CXXFLAGS += -Werror
17 }
17 }
18
18
19 unix:{
19 unix:{
General Comments 0
You need to be logged in to leave comments. Login now