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

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

Fixing qml build for latest Qt5...
Jani Honkonen -
r2247:c28e9eaa694f
parent child
Show More
Side by Side Unified
Context file:
r2247:c28e9eaa694f Loading diff...:
Show file before | Show file after | Hide comments
@@ -85,8 +85,6 linux-arm*: {
85 85 DEFINES+=QT_ON_ARM
86 86 }
87 87
88 greaterThan(QT_MAJOR_VERSION, 4): DEFINES += QT5_QUICK_1
89
90 88 ##################### INCLUDES ############################################################
91 89
92 90
Show file before | Show file after | Hide comments
@@ -19,11 +19,7
19 19 ****************************************************************************/
20 20
21 21 #include <QApplication>
22 #ifdef QT5_QUICK_1
23 #include <QtQuick1/QDeclarativeEngine>
24 #else
25 22 #include <QtDeclarative/QDeclarativeEngine>
26 #endif
27 23 #include "qmlapplicationviewer.h"
28 24
29 25 Q_DECL_EXPORT int main(int argc, char *argv[])
Show file before | Show file after | Hide comments
@@ -12,15 +12,9
12 12
13 13 #include <QtCore/QDir>
14 14 #include <QtCore/QFileInfo>
15 #ifdef QT5_QUICK_1
16 #include <QtQuick1/QDeclarativeComponent>
17 #include <QtQuick1/QDeclarativeEngine>
18 #include <QtQuick1/QDeclarativeContext>
19 #else
20 15 #include <QtDeclarative/QDeclarativeComponent>
21 16 #include <QtDeclarative/QDeclarativeEngine>
22 17 #include <QtDeclarative/QDeclarativeContext>
23 #endif
24 18 #include <QApplication>
25 19
26 20 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
Show file before | Show file after | Hide comments
@@ -11,11 +11,7
11 11 #ifndef QMLAPPLICATIONVIEWER_H
12 12 #define QMLAPPLICATIONVIEWER_H
13 13
14 #ifdef QT5_QUICK_1
15 #include <QtQuick1/QDeclarativeView>
16 #else
17 14 #include <QtDeclarative/QDeclarativeView>
18 #endif
19 15
20 16 class QmlApplicationViewer : public QDeclarativeView
21 17 {
Show file before | Show file after | Hide comments
@@ -1,8 +1,4
1 greaterThan(QT_MAJOR_VERSION, 4) {
2 QT += quick1
3 } else {
4 1 QT += declarative
5 }
6 2
7 3 SOURCES += $$PWD/qmlapplicationviewer.cpp
8 4 HEADERS += $$PWD/qmlapplicationviewer.h
Show file before | Show file after | Hide comments
@@ -19,11 +19,7
19 19 ****************************************************************************/
20 20
21 21 #include <QApplication>
22 #ifdef QT5_QUICK_1
23 #include <QtQuick1/QDeclarativeEngine>
24 #else
25 22 #include <QtDeclarative/QDeclarativeEngine>
26 #endif
27 23 #include "qmlapplicationviewer.h"
28 24
29 25 Q_DECL_EXPORT int main(int argc, char *argv[])
Show file before | Show file after | Hide comments
@@ -12,15 +12,9
12 12
13 13 #include <QtCore/QDir>
14 14 #include <QtCore/QFileInfo>
15 #ifdef QT5_QUICK_1
16 #include <QtQuick1/QDeclarativeComponent>
17 #include <QtQuick1/QDeclarativeEngine>
18 #include <QtQuick1/QDeclarativeContext>
19 #else
20 15 #include <QtDeclarative/QDeclarativeComponent>
21 16 #include <QtDeclarative/QDeclarativeEngine>
22 17 #include <QtDeclarative/QDeclarativeContext>
23 #endif
24 18 #include <QApplication>
25 19
26 20 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
Show file before | Show file after | Hide comments
@@ -11,11 +11,7
11 11 #ifndef QMLAPPLICATIONVIEWER_H
12 12 #define QMLAPPLICATIONVIEWER_H
13 13
14 #ifdef QT5_QUICK_1
15 #include <QtQuick1/QDeclarativeView>
16 #else
17 14 #include <QtDeclarative/QDeclarativeView>
18 #endif
19 15
20 16 class QmlApplicationViewer : public QDeclarativeView
21 17 {
Show file before | Show file after | Hide comments
@@ -1,8 +1,4
1 greaterThan(QT_MAJOR_VERSION, 4) {
2 QT += quick1
3 } else {
4 1 QT += declarative
5 }
6 2
7 3 SOURCES += $$PWD/qmlapplicationviewer.cpp
8 4 HEADERS += $$PWD/qmlapplicationviewer.h
Show file before | Show file after | Hide comments
@@ -19,11 +19,7
19 19 ****************************************************************************/
20 20
21 21 #include <QApplication>
22 #ifdef QT5_QUICK_1
23 #include <QtQuick1/QDeclarativeEngine>
24 #else
25 22 #include <QtDeclarative/QDeclarativeEngine>
26 #endif
27 23 #include "qmlapplicationviewer.h"
28 24
29 25 Q_DECL_EXPORT int main(int argc, char *argv[])
Show file before | Show file after | Hide comments
@@ -12,15 +12,9
12 12
13 13 #include <QtCore/QDir>
14 14 #include <QtCore/QFileInfo>
15 #ifdef QT5_QUICK_1
16 #include <QtQuick1/QDeclarativeComponent>
17 #include <QtQuick1/QDeclarativeEngine>
18 #include <QtQuick1/QDeclarativeContext>
19 #else
20 15 #include <QtDeclarative/QDeclarativeComponent>
21 16 #include <QtDeclarative/QDeclarativeEngine>
22 17 #include <QtDeclarative/QDeclarativeContext>
23 #endif
24 18 #include <QApplication>
25 19
26 20 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
Show file before | Show file after | Hide comments
@@ -11,11 +11,7
11 11 #ifndef QMLAPPLICATIONVIEWER_H
12 12 #define QMLAPPLICATIONVIEWER_H
13 13
14 #ifdef QT5_QUICK_1
15 #include <QtQuick1/QDeclarativeView>
16 #else
17 14 #include <QtDeclarative/QDeclarativeView>
18 #endif
19 15
20 16 class QmlApplicationViewer : public QDeclarativeView
21 17 {
Show file before | Show file after | Hide comments
@@ -1,8 +1,4
1 greaterThan(QT_MAJOR_VERSION, 4) {
2 QT += quick1
3 } else {
4 1 QT += declarative
5 }
6 2
7 3 SOURCES += $$PWD/qmlapplicationviewer.cpp
8 4 HEADERS += $$PWD/qmlapplicationviewer.h
Show file before | Show file after | Hide comments
@@ -19,11 +19,7
19 19 ****************************************************************************/
20 20
21 21 #include <QApplication>
22 #ifdef QT5_QUICK_1
23 #include <QtQuick1/QDeclarativeEngine>
24 #else
25 22 #include <QtDeclarative/QDeclarativeEngine>
26 #endif
27 23 #include "qmlapplicationviewer.h"
28 24
29 25 Q_DECL_EXPORT int main(int argc, char *argv[])
Show file before | Show file after | Hide comments
@@ -12,15 +12,9
12 12
13 13 #include <QtCore/QDir>
14 14 #include <QtCore/QFileInfo>
15 #ifdef QT5_QUICK_1
16 #include <QtQuick1/QDeclarativeComponent>
17 #include <QtQuick1/QDeclarativeEngine>
18 #include <QtQuick1/QDeclarativeContext>
19 #else
20 15 #include <QtDeclarative/QDeclarativeComponent>
21 16 #include <QtDeclarative/QDeclarativeEngine>
22 17 #include <QtDeclarative/QDeclarativeContext>
23 #endif
24 18 #include <QApplication>
25 19
26 20 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
Show file before | Show file after | Hide comments
@@ -11,11 +11,7
11 11 #ifndef QMLAPPLICATIONVIEWER_H
12 12 #define QMLAPPLICATIONVIEWER_H
13 13
14 #ifdef QT5_QUICK_1
15 #include <QtQuick1/QDeclarativeView>
16 #else
17 14 #include <QtDeclarative/QDeclarativeView>
18 #endif
19 15
20 16 class QmlApplicationViewer : public QDeclarativeView
21 17 {
Show file before | Show file after | Hide comments
@@ -1,8 +1,4
1 greaterThan(QT_MAJOR_VERSION, 4) {
2 QT += quick1
3 } else {
4 1 QT += declarative
5 }
6 2
7 3 SOURCES += $$PWD/qmlapplicationviewer.cpp
8 4 HEADERS += $$PWD/qmlapplicationviewer.h
Show file before | Show file after | Hide comments
@@ -19,14 +19,8
19 19 ****************************************************************************/
20 20
21 21 #include <QApplication>
22 #ifdef QT5_QUICK_1
23 #include <QtQuick1/qdeclarative.h>
24 #include <QtQuick1/QDeclarativeEngine>
25 #else
26 22 #include <QtDeclarative>
27 23 #include <QtDeclarative/QDeclarativeEngine>
28 #endif
29 //#include <QtDeclarative>
30 24 #include <QAbstractItemModel>
31 25 #include "declarativemodel.h"
32 26 #include "customtablemodel.h"
Show file before | Show file after | Hide comments
@@ -12,15 +12,9
12 12
13 13 #include <QtCore/QDir>
14 14 #include <QtCore/QFileInfo>
15 #ifdef QT5_QUICK_1
16 #include <QtQuick1/QDeclarativeComponent>
17 #include <QtQuick1/QDeclarativeEngine>
18 #include <QtQuick1/QDeclarativeContext>
19 #else
20 15 #include <QtDeclarative/QDeclarativeComponent>
21 16 #include <QtDeclarative/QDeclarativeEngine>
22 17 #include <QtDeclarative/QDeclarativeContext>
23 #endif
24 18 #include <QApplication>
25 19
26 20 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
Show file before | Show file after | Hide comments
@@ -11,11 +11,7
11 11 #ifndef QMLAPPLICATIONVIEWER_H
12 12 #define QMLAPPLICATIONVIEWER_H
13 13
14 #ifdef QT5_QUICK_1
15 #include <QtQuick1/QDeclarativeView>
16 #else
17 14 #include <QtDeclarative/QDeclarativeView>
18 #endif
19 15
20 16 class QmlApplicationViewer : public QDeclarativeView
21 17 {
Show file before | Show file after | Hide comments
@@ -1,8 +1,4
1 greaterThan(QT_MAJOR_VERSION, 4) {
2 QT += quick1
3 } else {
4 1 QT += declarative
5 }
6 2
7 3 SOURCES += $$PWD/qmlapplicationviewer.cpp
8 4 HEADERS += $$PWD/qmlapplicationviewer.h
Show file before | Show file after | Hide comments
@@ -13,16 +13,9
13 13 #include <QDir>
14 14 #include <QFileInfo>
15 15 #include <QApplication>
16 #ifdef QT5_QUICK_1
17 #include <QtQuick1/QDeclarativeComponent>
18 #include <QtQuick1/QDeclarativeEngine>
19 #include <QtQuick1/QDeclarativeContext>
20 #else
21 16 #include <QtDeclarative/QDeclarativeComponent>
22 17 #include <QtDeclarative/QDeclarativeEngine>
23 18 #include <QtDeclarative/QDeclarativeContext>
24 #endif
25
26 19 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
27 20
28 21 #ifdef HARMATTAN_BOOSTER
Show file before | Show file after | Hide comments
@@ -11,11 +11,7
11 11 #ifndef QMLAPPLICATIONVIEWER_H
12 12 #define QMLAPPLICATIONVIEWER_H
13 13
14 #ifdef QT5_QUICK_1
15 #include <QtQuick1/QDeclarativeView>
16 #else
17 14 #include <QtDeclarative/QDeclarativeView>
18 #endif
19 15
20 16 class QmlApplicationViewer : public QDeclarativeView
21 17 {
Show file before | Show file after | Hide comments
@@ -5,11 +5,7
5 5 # It is recommended not to modify this file, since newer versions of Qt Creator
6 6 # may offer an updated version of it.
7 7
8 greaterThan(QT_MAJOR_VERSION, 4) {
9 QT += quick1
10 } else {
11 8 QT += declarative
12 }
13 9
14 10 SOURCES += $$PWD/qmlapplicationviewer.cpp
15 11 HEADERS += $$PWD/qmlapplicationviewer.h
Show file before | Show file after | Hide comments
@@ -19,11 +19,7
19 19 ****************************************************************************/
20 20
21 21 #include <QApplication>
22 #ifdef QT5_QUICK_1
23 #include <QtQuick1/QDeclarativeContext>
24 #else
25 22 #include <QtDeclarative/QDeclarativeContext>
26 #endif
27 23 #include "qmlapplicationviewer.h"
28 24 #include "datasource.h"
29 25
Show file before | Show file after | Hide comments
@@ -12,15 +12,9
12 12
13 13 #include <QtCore/QDir>
14 14 #include <QtCore/QFileInfo>
15 #ifdef QT5_QUICK_1
16 #include <QtQuick1/QDeclarativeComponent>
17 #include <QtQuick1/QDeclarativeEngine>
18 #include <QtQuick1/QDeclarativeContext>
19 #else
20 15 #include <QtDeclarative/QDeclarativeComponent>
21 16 #include <QtDeclarative/QDeclarativeEngine>
22 17 #include <QtDeclarative/QDeclarativeContext>
23 #endif
24 18 #include <QApplication>
25 19
26 20 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
Show file before | Show file after | Hide comments
@@ -11,11 +11,7
11 11 #ifndef QMLAPPLICATIONVIEWER_H
12 12 #define QMLAPPLICATIONVIEWER_H
13 13
14 #ifdef QT5_QUICK_1
15 #include <QtQuick1/QDeclarativeView>
16 #else
17 14 #include <QtDeclarative/QDeclarativeView>
18 #endif
19 15
20 16 class QmlApplicationViewer : public QDeclarativeView
21 17 {
Show file before | Show file after | Hide comments
@@ -1,8 +1,4
1 greaterThan(QT_MAJOR_VERSION, 4) {
2 QT += quick1
3 } else {
4 1 QT += declarative
5 }
6 2
7 3 SOURCES += $$PWD/qmlapplicationviewer.cpp
8 4 HEADERS += $$PWD/qmlapplicationviewer.h
Show file before | Show file after | Hide comments
@@ -19,11 +19,7
19 19 ****************************************************************************/
20 20
21 21 #include <QApplication>
22 #ifdef QT5_QUICK_1
23 #include <QtQuick1/QDeclarativeContext>
24 #else
25 22 #include <QtDeclarative/QDeclarativeContext>
26 #endif
27 23 #include <QDebug>
28 24 #include "qmlapplicationviewer.h"
29 25
Show file before | Show file after | Hide comments
@@ -12,15 +12,9
12 12
13 13 #include <QDir>
14 14 #include <QFileInfo>
15 #ifdef QT5_QUICK_1
16 #include <QtQuick1/QDeclarativeComponent>
17 #include <QtQuick1/QDeclarativeEngine>
18 #include <QtQuick1/QDeclarativeContext>
19 #else
20 15 #include <QtDeclarative/QDeclarativeComponent>
21 16 #include <QtDeclarative/QDeclarativeEngine>
22 17 #include <QtDeclarative/QDeclarativeContext>
23 #endif
24 18 #include <QApplication>
25 19
26 20 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
Show file before | Show file after | Hide comments
@@ -5,11 +5,7
5 5 # It is recommended not to modify this file, since newer versions of Qt Creator
6 6 # may offer an updated version of it.
7 7
8 greaterThan(QT_MAJOR_VERSION, 4) {
9 QT += quick1
10 } else {
11 8 QT += declarative
12 }
13 9
14 10 SOURCES += $$PWD/qmlapplicationviewer.cpp
15 11 HEADERS += $$PWD/qmlapplicationviewer.h
Show file before | Show file after | Hide comments
@@ -19,11 +19,7
19 19 ****************************************************************************/
20 20
21 21 #include <QApplication>
22 #ifdef QT5_QUICK_1
23 #include <QtQuick1/QDeclarativeEngine>
24 #else
25 22 #include <QtDeclarative/QDeclarativeEngine>
26 #endif
27 23 #include "qmlapplicationviewer.h"
28 24
29 25 Q_DECL_EXPORT int main(int argc, char *argv[])
Show file before | Show file after | Hide comments
@@ -12,16 +12,9
12 12
13 13 #include <QtCore/QDir>
14 14 #include <QtCore/QFileInfo>
15 #ifdef QT5_QUICK_1
16 #include <QtQuick1/QDeclarativeComponent>
17 #include <QtQuick1/QDeclarativeEngine>
18 #include <QtQuick1/QDeclarativeContext>
19 #else
20 15 #include <QtDeclarative/QDeclarativeComponent>
21 16 #include <QtDeclarative/QDeclarativeEngine>
22 17 #include <QtDeclarative/QDeclarativeContext>
23 #endif
24
25 18 #include <QApplication>
26 19
27 20 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
Show file before | Show file after | Hide comments
@@ -11,11 +11,7
11 11 #ifndef QMLAPPLICATIONVIEWER_H
12 12 #define QMLAPPLICATIONVIEWER_H
13 13
14 #ifdef QT5_QUICK_1
15 #include <QtQuick1/QDeclarativeView>
16 #else
17 14 #include <QtDeclarative/QDeclarativeView>
18 #endif
19 15
20 16 class QmlApplicationViewer : public QDeclarativeView
21 17 {
Show file before | Show file after | Hide comments
@@ -1,8 +1,4
1 greaterThan(QT_MAJOR_VERSION, 4) {
2 QT += quick1
3 } else {
4 1 QT += declarative
5 }
6 2
7 3 SOURCES += $$PWD/qmlapplicationviewer.cpp
8 4 HEADERS += $$PWD/qmlapplicationviewer.h
Show file before | Show file after | Hide comments
@@ -3,11 +3,7
3 3 }
4 4
5 5 TARGET = qtcommercialchartqml
6 greaterThan(QT_MAJOR_VERSION, 4) {
7 QT += quick1
8 } else {
9 6 QT += declarative
10 }
11 7 DESTDIR = $$CHART_BUILD_QML_PLUGIN_DIR
12 8 INCLUDEPATH += $$CHART_BUILD_PRIVATE_HEADER_DIR
13 9
Show file before | Show file after | Hide comments
@@ -28,13 +28,8
28 28 #include "qhorizontalstackedbarseries.h"
29 29 #include "qhorizontalpercentbarseries.h"
30 30 #include "qbarset.h"
31 #ifdef QT5_QUICK_1
32 #include <QtQuick1/QDeclarativeItem>
33 #include <QtQuick1/QDeclarativeParserStatus>
34 #else
35 31 #include <QtDeclarative/QDeclarativeItem>
36 32 #include <QtDeclarative/QDeclarativeParserStatus>
37 #endif
38 33
39 34 QTCOMMERCIALCHART_BEGIN_NAMESPACE
40 35
Show file before | Show file after | Hide comments
@@ -22,13 +22,8
22 22 #define DECLARATIVECATEGORYAXIS_H
23 23
24 24 #include "qcategoryaxis.h"
25 #ifdef QT5_QUICK_1
26 #include <QtQuick1/QDeclarativeListProperty>
27 #include <QtQuick1/QDeclarativeParserStatus>
28 #else
29 25 #include <QtDeclarative/QDeclarativeListProperty>
30 26 #include <QtDeclarative/QDeclarativeParserStatus>
31 #endif
32 27
33 28 QTCOMMERCIALCHART_BEGIN_NAMESPACE
34 29
Show file before | Show file after | Hide comments
@@ -22,11 +22,8
22 22 #define DECLARATIVECHART_H
23 23
24 24 #include <QtCore/QtGlobal>
25 #ifdef QT5_QUICK_1
26 #include <QtQuick1/QDeclarativeItem>
27 #else
28 25 #include <QtDeclarative/QDeclarativeItem>
29 #endif
26
30 27 #include "qchart.h"
31 28
32 29 QTCOMMERCIALCHART_BEGIN_NAMESPACE
@@ -121,7 +118,7 public:
121 118 qreal leftMargin();
122 119 qreal rightMargin();
123 120 void createDefaultAxes(QAbstractSeries *series);
124 //TODO this is depreciated:
121 //TODO this is deprecated:
125 122 DeclarativeMargins *minimumMargins() { return m_margins; }
126 123
127 124 Q_REVISION(2) DeclarativeMargins *margins() { return m_margins; }
Show file before | Show file after | Hide comments
@@ -23,13 +23,8
23 23
24 24 #include "qlineseries.h"
25 25 #include "declarativexyseries.h"
26 #ifdef QT5_QUICK_1
27 #include <QtQuick1/QDeclarativeListProperty>
28 #include <QtQuick1/QDeclarativeParserStatus>
29 #else
30 26 #include <QtDeclarative/QDeclarativeListProperty>
31 27 #include <QtDeclarative/QDeclarativeParserStatus>
32 #endif
33 28
34 29 QTCOMMERCIALCHART_BEGIN_NAMESPACE
35 30
Show file before | Show file after | Hide comments
@@ -22,13 +22,8
22 22 #define DECLARATIVEPIESERIES_H
23 23
24 24 #include "qpieseries.h"
25 #ifdef QT5_QUICK_1
26 #include <QtQuick1/QDeclarativeItem>
27 #include <QtQuick1/QDeclarativeParserStatus>
28 #else
29 25 #include <QtDeclarative/QDeclarativeItem>
30 26 #include <QtDeclarative/QDeclarativeParserStatus>
31 #endif
32 27
33 28 QTCOMMERCIALCHART_BEGIN_NAMESPACE
34 29 class QPieSlice;
Show file before | Show file after | Hide comments
@@ -23,13 +23,8
23 23
24 24 #include "qscatterseries.h"
25 25 #include "declarativexyseries.h"
26 #ifdef QT5_QUICK_1
27 #include <QtQuick1/QDeclarativeListProperty>
28 #include <QtQuick1/QDeclarativeParserStatus>
29 #else
30 26 #include <QtDeclarative/QDeclarativeListProperty>
31 27 #include <QtDeclarative/QDeclarativeParserStatus>
32 #endif
33 28
34 29 QTCOMMERCIALCHART_BEGIN_NAMESPACE
35 30
Show file before | Show file after | Hide comments
@@ -23,13 +23,8
23 23
24 24 #include "qsplineseries.h"
25 25 #include "declarativexyseries.h"
26 #ifdef QT5_QUICK_1
27 #include <QtQuick1/QDeclarativeListProperty>
28 #include <QtQuick1/QDeclarativeParserStatus>
29 #else
30 26 #include <QtDeclarative/QDeclarativeListProperty>
31 27 #include <QtDeclarative/QDeclarativeParserStatus>
32 #endif
33 28
34 29 QTCOMMERCIALCHART_BEGIN_NAMESPACE
35 30
Show file before | Show file after | Hide comments
@@ -18,13 +18,6
18 18 **
19 19 ****************************************************************************/
20 20
21 #ifdef QT5_QUICK_1
22 #include <QtQuick1/qdeclarativeextensionplugin.h>
23 #include <QtQuick1/qdeclarative.h>
24 #else
25 #include <QtDeclarative/qdeclarativeextensionplugin.h>
26 #include <QtDeclarative/qdeclarative.h>
27 #endif
28 21 #include "qchart.h"
29 22 #include "qabstractaxis.h"
30 23 #include "qvalueaxis.h"
@@ -45,11 +38,12
45 38 #include "qhbarmodelmapper.h"
46 39 #include "qvbarmodelmapper.h"
47 40 #include "declarativemargins.h"
48 #include <QAbstractItemModel>
49
50 41 #ifndef QT_ON_ARM
51 42 #include "qdatetimeaxis.h"
52 43 #endif
44 #include <QAbstractItemModel>
45 #include <QtDeclarative/qdeclarativeextensionplugin.h>
46 #include <QtDeclarative/qdeclarative.h>
53 47
54 48 QTCOMMERCIALCHART_USE_NAMESPACE
55 49
@@ -62,9 +56,8 class ChartQmlPlugin : public QDeclarativeExtensionPlugin
62 56 {
63 57 Q_OBJECT
64 58
65 #ifdef QT5_QUICK_1
66 // TODO: fix the metadata
67 Q_PLUGIN_METADATA(IID "org.qt-project.foo")
59 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
60 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDeclarativeExtensionInterface")
68 61 #endif
69 62
70 63 public:
@@ -153,6 +146,6 QTCOMMERCIALCHART_END_NAMESPACE
153 146
154 147 QTCOMMERCIALCHART_USE_NAMESPACE
155 148
156 #ifndef QT5_QUICK_1
149 #if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
157 150 Q_EXPORT_PLUGIN2(qtcommercialchartqml, QT_PREPEND_NAMESPACE(ChartQmlPlugin))
158 151 #endif
Show file before | Show file after | Hide comments
@@ -84,7 +84,7 QWidget *QChartsPlugin::createWidget(QWidget *parent)
84 84 return new QChartView(new QChart(), parent);
85 85 }
86 86
87 #ifndef QT5_QUICK_1
87 #if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
88 88 Q_EXPORT_PLUGIN2(qtcommercialchart, QChartsPlugin)
89 89 #endif
90 90
Show file before | Show file after | Hide comments
@@ -26,8 +26,8
26 26 class QChartsPlugin: public QObject, public QDesignerCustomWidgetInterface
27 27 {
28 28
29 #ifdef QT5_QUICK_1
30 Q_PLUGIN_METADATA(IID "org.qt-project.bar")
29 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
30 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface")
31 31 #endif
32 32
33 33 Q_OBJECT
Show file before | Show file after | Hide comments
@@ -31,11 +31,7 private Q_SLOTS:
31 31
32 32 void tst_ChartDataSet::skip()
33 33 {
34 #ifdef QT5_QUICK_1
35 QSKIP("This test requires the debug version of library");
36 #else
37 34 QSKIP("This test requires the debug version of library", SkipAll);
38 #endif
39 35 }
40 36
41 37 QTEST_MAIN(tst_ChartDataSet)
Show file before | Show file after | Hide comments
@@ -32,11 +32,7 private Q_SLOTS:
32 32
33 33 void tst_Domain::skip()
34 34 {
35 #ifdef QT5_QUICK_1
36 QSKIP("This test requires the debug version of library");
37 #else
38 35 QSKIP("This test requires the debug version of library", SkipAll);
39 #endif
40 36 }
41 37
42 38 QTEST_MAIN(tst_Domain)
Show file before | Show file after | Hide comments
@@ -50,20 +50,6 namespace QTest
50 50 // Some bamboo clients have trouble passing mouse events to the test application.
51 51 // This can be used to skip those tests so that they don't show up as a failure
52 52 // in the test report.
53 #ifdef QT5_QUICK_1
54 #define SKIP_IF_CANNOT_TEST_MOUSE_EVENTS() { \
55 do { \
56 QPushButton b; \
57 b.resize(100, 100); \
58 b.show(); \
59 QTest::qWaitForWindowShown(&b); \
60 QSignalSpy spy(&b, SIGNAL(clicked())); \
61 QTest::mouseClick(&b, Qt::LeftButton, 0, b.rect().center()); \
62 if (spy.count() == 0) \
63 QSKIP("Cannot test mouse events in this environment"); \
64 } while (0); \
65 }
66 #else
67 53 #define SKIP_IF_CANNOT_TEST_MOUSE_EVENTS() { \
68 54 do { \
69 55 QPushButton b; \
@@ -76,6 +62,5 namespace QTest
76 62 QSKIP("Cannot test mouse events in this environment", SkipAll); \
77 63 } while (0); \
78 64 }
79 #endif
80 65
81 66 #endif // TST_DEFINITIONS_H
Show file before | Show file after | Hide comments
@@ -139,11 +139,7 void tst_QAbstractAxis::axisPenColor_data()
139 139
140 140 void tst_QAbstractAxis::axisPenColor()
141 141 {
142 #ifdef QT5_QUICK_1
143 QSKIP("Test is not implemented. This is depreciated function");
144 #else
145 QSKIP("Test is not implemented. This is depreciated function", SkipAll);
146 #endif
142 QSKIP("Test is not implemented. This is deprecated function", SkipAll);
147 143 }
148 144
149 145 void tst_QAbstractAxis::gridLinePen_data()
@@ -408,11 +404,7 void tst_QAbstractAxis::labelsColor_data()
408 404
409 405 void tst_QAbstractAxis::labelsColor()
410 406 {
411 #ifdef QT5_QUICK_1
412 QSKIP("Test is not implemented. This is depreciated function");
413 #else
414 QSKIP("Test is not implemented. This is depreciated function", SkipAll);
415 #endif
407 QSKIP("Test is not implemented. This is deprecated function", SkipAll);
416 408 }
417 409
418 410 void tst_QAbstractAxis::labelsFont_data()
@@ -637,11 +629,7 void tst_QAbstractAxis::shadesBorderColor_data()
637 629
638 630 void tst_QAbstractAxis::shadesBorderColor()
639 631 {
640 #ifdef QT5_QUICK_1
641 QSKIP("Test is not implemented. This is depreciated function");
642 #else
643 QSKIP("Test is not implemented. This is depreciated function", SkipAll);
644 #endif
632 QSKIP("Test is not implemented. This is deprecated function", SkipAll);
645 633 }
646 634
647 635 void tst_QAbstractAxis::shadesBrush_data()
@@ -691,11 +679,7 void tst_QAbstractAxis::shadesColor_data()
691 679 // public QColor shadesColor() const
692 680 void tst_QAbstractAxis::shadesColor()
693 681 {
694 #ifdef QT5_QUICK_1
695 QSKIP("Test is not implemented. This is depreciated function");
696 #else
697 QSKIP("Test is not implemented. This is depreciated function", SkipAll);
698 #endif
682 QSKIP("Test is not implemented. This is deprecated function", SkipAll);
699 683 }
700 684
701 685 void tst_QAbstractAxis::shadesPen_data()
Show file before | Show file after | Hide comments
@@ -2,8 +2,4
2 2 error( "Couldn't find the auto.pri file!" )
3 3 }
4 4 SOURCES += tst_qml.cpp
5 greaterThan(QT_MAJOR_VERSION, 4) {
6 QT += quick1
7 } else {
8 5 QT += declarative
9 }
Show file before | Show file after | Hide comments
@@ -12,15 +12,9
12 12
13 13 #include <QtCore/QDir>
14 14 #include <QtCore/QFileInfo>
15 #ifdef QT5_QUICK_1
16 #include <QtQuick1/QDeclarativeComponent>
17 #include <QtQuick1/QDeclarativeEngine>
18 #include <QtQuick1/QDeclarativeContext>
19 #else
20 15 #include <QtDeclarative/QDeclarativeComponent>
21 16 #include <QtDeclarative/QDeclarativeEngine>
22 17 #include <QtDeclarative/QDeclarativeContext>
23 #endif
24 18 #include <QApplication>
25 19
26 20 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
Show file before | Show file after | Hide comments
@@ -11,11 +11,7
11 11 #ifndef QMLAPPLICATIONVIEWER_H
12 12 #define QMLAPPLICATIONVIEWER_H
13 13
14 #ifdef QT5_QUICK_1
15 #include <QtQuick1/QDeclarativeView>
16 #else
17 14 #include <QtDeclarative/QDeclarativeView>
18 #endif
19 15
20 16 class QmlApplicationViewer : public QDeclarativeView
21 17 {
Show file before | Show file after | Hide comments
@@ -1,8 +1,4
1 greaterThan(QT_MAJOR_VERSION, 4) {
2 QT += quick1
3 } else {
4 1 QT += declarative
5 }
6 2
7 3 SOURCES += $$PWD/qmlapplicationviewer.cpp
8 4 HEADERS += $$PWD/qmlapplicationviewer.h
Show file before | Show file after | Hide comments
@@ -12,15 +12,9
12 12
13 13 #include <QtCore/QDir>
14 14 #include <QtCore/QFileInfo>
15 #ifdef QT5_QUICK_1
16 #include <QtQuick1/QDeclarativeComponent>
17 #include <QtQuick1/QDeclarativeEngine>
18 #include <QtQuick1/QDeclarativeContext>
19 #else
20 15 #include <QtDeclarative/QDeclarativeComponent>
21 16 #include <QtDeclarative/QDeclarativeEngine>
22 17 #include <QtDeclarative/QDeclarativeContext>
23 #endif
24 18 #include <QApplication>
25 19
26 20 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
Show file before | Show file after | Hide comments
@@ -11,11 +11,7
11 11 #ifndef QMLAPPLICATIONVIEWER_H
12 12 #define QMLAPPLICATIONVIEWER_H
13 13
14 #ifdef QT5_QUICK_1
15 #include <QtQuick1/QDeclarativeView>
16 #else
17 14 #include <QtDeclarative/QDeclarativeView>
18 #endif
19 15
20 16 class QmlApplicationViewer : public QDeclarativeView
21 17 {
Show file before | Show file after | Hide comments
@@ -1,8 +1,4
1 greaterThan(QT_MAJOR_VERSION, 4) {
2 QT += quick1
3 } else {
4 1 QT += declarative
5 }
6 2
7 3 SOURCES += $$PWD/qmlapplicationviewer.cpp
8 4 HEADERS += $$PWD/qmlapplicationviewer.h
General Comments 0
You need to be logged in to leave comments. Login now