diff --git a/config.pri b/config.pri index d82dcde..03a2364 100644 --- a/config.pri +++ b/config.pri @@ -19,17 +19,17 @@ coverage: CONFIG += debug !contains($${PWD}, $${OUT_PWD}){ search = "$$PWD:::" - temp = $$split(search,"/") + temp = $$split(search,"/") temp = $$last(temp) path = $$replace(search,$$temp,'') temp = $$split(OUT_PWD,$$path) temp = $$split(temp,'/') temp = $$first(temp) path = "$${path}$${temp}" - SHADOW=$$path + SHADOW=$$path }else{ SHADOW=$$PWD - CONFIG-=development_build + CONFIG-=development_build } ##################### BUILD PATHS ################################################## @@ -85,8 +85,6 @@ linux-arm*: { DEFINES+=QT_ON_ARM } -greaterThan(QT_MAJOR_VERSION, 4): DEFINES += QT5_QUICK_1 - ##################### INCLUDES ############################################################ diff --git a/demos/qmlaxes/main.cpp b/demos/qmlaxes/main.cpp index 9a82fec..dd13fa8 100644 --- a/demos/qmlaxes/main.cpp +++ b/demos/qmlaxes/main.cpp @@ -19,11 +19,7 @@ ****************************************************************************/ #include -#ifdef QT5_QUICK_1 - #include -#else - #include -#endif +#include #include "qmlapplicationviewer.h" Q_DECL_EXPORT int main(int argc, char *argv[]) diff --git a/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.cpp index 05ba5a3..efbf1e3 100644 --- a/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -12,15 +12,9 @@ #include #include -#ifdef QT5_QUICK_1 - #include - #include - #include -#else - #include - #include - #include -#endif +#include +#include +#include #include #include // MEEGO_EDITION_HARMATTAN diff --git a/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.h b/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.h index 7f85658..9d0fea2 100644 --- a/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.h +++ b/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.h @@ -11,11 +11,7 @@ #ifndef QMLAPPLICATIONVIEWER_H #define QMLAPPLICATIONVIEWER_H -#ifdef QT5_QUICK_1 - #include -#else - #include -#endif +#include class QmlApplicationViewer : public QDeclarativeView { diff --git a/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.pri index 830526b..567c6dc 100644 --- a/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.pri @@ -1,8 +1,4 @@ -greaterThan(QT_MAJOR_VERSION, 4) { - QT += quick1 -} else { - QT += declarative -} +QT += declarative SOURCES += $$PWD/qmlapplicationviewer.cpp HEADERS += $$PWD/qmlapplicationviewer.h diff --git a/demos/qmlchart/main.cpp b/demos/qmlchart/main.cpp index 582d9a3..ed856ed 100644 --- a/demos/qmlchart/main.cpp +++ b/demos/qmlchart/main.cpp @@ -19,11 +19,7 @@ ****************************************************************************/ #include -#ifdef QT5_QUICK_1 - #include -#else - #include -#endif +#include #include "qmlapplicationviewer.h" Q_DECL_EXPORT int main(int argc, char *argv[]) diff --git a/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp index 05ba5a3..efbf1e3 100644 --- a/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -12,15 +12,9 @@ #include #include -#ifdef QT5_QUICK_1 - #include - #include - #include -#else - #include - #include - #include -#endif +#include +#include +#include #include #include // MEEGO_EDITION_HARMATTAN diff --git a/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.h b/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.h index 7f85658..9d0fea2 100644 --- a/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.h +++ b/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.h @@ -11,11 +11,7 @@ #ifndef QMLAPPLICATIONVIEWER_H #define QMLAPPLICATIONVIEWER_H -#ifdef QT5_QUICK_1 - #include -#else - #include -#endif +#include class QmlApplicationViewer : public QDeclarativeView { diff --git a/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri index 830526b..567c6dc 100644 --- a/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri @@ -1,8 +1,4 @@ -greaterThan(QT_MAJOR_VERSION, 4) { - QT += quick1 -} else { - QT += declarative -} +QT += declarative SOURCES += $$PWD/qmlapplicationviewer.cpp HEADERS += $$PWD/qmlapplicationviewer.h diff --git a/demos/qmlcustomizations/main.cpp b/demos/qmlcustomizations/main.cpp index 50fb77e..a753848 100644 --- a/demos/qmlcustomizations/main.cpp +++ b/demos/qmlcustomizations/main.cpp @@ -19,11 +19,7 @@ ****************************************************************************/ #include -#ifdef QT5_QUICK_1 - #include -#else - #include -#endif +#include #include "qmlapplicationviewer.h" Q_DECL_EXPORT int main(int argc, char *argv[]) diff --git a/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.cpp index 05ba5a3..efbf1e3 100644 --- a/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -12,15 +12,9 @@ #include #include -#ifdef QT5_QUICK_1 - #include - #include - #include -#else - #include - #include - #include -#endif +#include +#include +#include #include #include // MEEGO_EDITION_HARMATTAN diff --git a/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.h b/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.h index 7f85658..9d0fea2 100644 --- a/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.h +++ b/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.h @@ -11,11 +11,7 @@ #ifndef QMLAPPLICATIONVIEWER_H #define QMLAPPLICATIONVIEWER_H -#ifdef QT5_QUICK_1 - #include -#else - #include -#endif +#include class QmlApplicationViewer : public QDeclarativeView { diff --git a/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.pri index 830526b..567c6dc 100644 --- a/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.pri @@ -1,8 +1,4 @@ -greaterThan(QT_MAJOR_VERSION, 4) { - QT += quick1 -} else { - QT += declarative -} +QT += declarative SOURCES += $$PWD/qmlapplicationviewer.cpp HEADERS += $$PWD/qmlapplicationviewer.h diff --git a/demos/qmlcustomlegend/main.cpp b/demos/qmlcustomlegend/main.cpp index 2bb44ee..562c676 100644 --- a/demos/qmlcustomlegend/main.cpp +++ b/demos/qmlcustomlegend/main.cpp @@ -19,11 +19,7 @@ ****************************************************************************/ #include -#ifdef QT5_QUICK_1 - #include -#else - #include -#endif +#include #include "qmlapplicationviewer.h" Q_DECL_EXPORT int main(int argc, char *argv[]) diff --git a/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.cpp index 08d207c..2e99f53 100644 --- a/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -12,15 +12,9 @@ #include #include -#ifdef QT5_QUICK_1 - #include - #include - #include -#else - #include - #include - #include -#endif +#include +#include +#include #include #include // MEEGO_EDITION_HARMATTAN diff --git a/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.h b/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.h index 22c35a1..9d7d776 100644 --- a/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.h +++ b/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.h @@ -11,11 +11,7 @@ #ifndef QMLAPPLICATIONVIEWER_H #define QMLAPPLICATIONVIEWER_H -#ifdef QT5_QUICK_1 - #include -#else - #include -#endif +#include class QmlApplicationViewer : public QDeclarativeView { diff --git a/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.pri index 8e891c0..8450019 100755 --- a/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.pri @@ -1,8 +1,4 @@ -greaterThan(QT_MAJOR_VERSION, 4) { - QT += quick1 -} else { - QT += declarative -} +QT += declarative SOURCES += $$PWD/qmlapplicationviewer.cpp HEADERS += $$PWD/qmlapplicationviewer.h diff --git a/demos/qmlcustommodel/main.cpp b/demos/qmlcustommodel/main.cpp index b4fea7c..a17d226 100644 --- a/demos/qmlcustommodel/main.cpp +++ b/demos/qmlcustommodel/main.cpp @@ -19,14 +19,8 @@ ****************************************************************************/ #include -#ifdef QT5_QUICK_1 - #include - #include -#else - #include - #include -#endif -//#include +#include +#include #include #include "declarativemodel.h" #include "customtablemodel.h" diff --git a/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.cpp index 05ba5a3..efbf1e3 100644 --- a/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -12,15 +12,9 @@ #include #include -#ifdef QT5_QUICK_1 - #include - #include - #include -#else - #include - #include - #include -#endif +#include +#include +#include #include #include // MEEGO_EDITION_HARMATTAN diff --git a/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.h b/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.h index 7f85658..9d0fea2 100644 --- a/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.h +++ b/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.h @@ -11,11 +11,7 @@ #ifndef QMLAPPLICATIONVIEWER_H #define QMLAPPLICATIONVIEWER_H -#ifdef QT5_QUICK_1 - #include -#else - #include -#endif +#include class QmlApplicationViewer : public QDeclarativeView { diff --git a/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.pri index 830526b..567c6dc 100644 --- a/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.pri @@ -1,8 +1,4 @@ -greaterThan(QT_MAJOR_VERSION, 4) { - QT += quick1 -} else { - QT += declarative -} +QT += declarative SOURCES += $$PWD/qmlapplicationviewer.cpp HEADERS += $$PWD/qmlapplicationviewer.h diff --git a/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.cpp index 269996b..f204eaf 100644 --- a/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -13,16 +13,9 @@ #include #include #include -#ifdef QT5_QUICK_1 - #include - #include - #include -#else - #include - #include - #include -#endif - +#include +#include +#include #include // MEEGO_EDITION_HARMATTAN #ifdef HARMATTAN_BOOSTER diff --git a/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.h b/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.h index c47bd7f..4983208 100644 --- a/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.h +++ b/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.h @@ -11,11 +11,7 @@ #ifndef QMLAPPLICATIONVIEWER_H #define QMLAPPLICATIONVIEWER_H -#ifdef QT5_QUICK_1 - #include -#else - #include -#endif +#include class QmlApplicationViewer : public QDeclarativeView { diff --git a/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.pri index 40bf295..b6931d0 100644 --- a/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.pri @@ -5,11 +5,7 @@ # It is recommended not to modify this file, since newer versions of Qt Creator # may offer an updated version of it. -greaterThan(QT_MAJOR_VERSION, 4) { - QT += quick1 -} else { - QT += declarative -} +QT += declarative SOURCES += $$PWD/qmlapplicationviewer.cpp HEADERS += $$PWD/qmlapplicationviewer.h diff --git a/demos/qmloscilloscope/main.cpp b/demos/qmloscilloscope/main.cpp index ef2346e..d2e29fd 100644 --- a/demos/qmloscilloscope/main.cpp +++ b/demos/qmloscilloscope/main.cpp @@ -19,11 +19,7 @@ ****************************************************************************/ #include -#ifdef QT5_QUICK_1 - #include -#else - #include -#endif +#include #include "qmlapplicationviewer.h" #include "datasource.h" diff --git a/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.cpp index 05ba5a3..efbf1e3 100644 --- a/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -12,15 +12,9 @@ #include #include -#ifdef QT5_QUICK_1 - #include - #include - #include -#else - #include - #include - #include -#endif +#include +#include +#include #include #include // MEEGO_EDITION_HARMATTAN diff --git a/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.h b/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.h index 7f85658..9d0fea2 100644 --- a/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.h +++ b/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.h @@ -11,11 +11,7 @@ #ifndef QMLAPPLICATIONVIEWER_H #define QMLAPPLICATIONVIEWER_H -#ifdef QT5_QUICK_1 - #include -#else - #include -#endif +#include class QmlApplicationViewer : public QDeclarativeView { diff --git a/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.pri index 830526b..567c6dc 100644 --- a/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.pri @@ -1,8 +1,4 @@ -greaterThan(QT_MAJOR_VERSION, 4) { - QT += quick1 -} else { - QT += declarative -} +QT += declarative SOURCES += $$PWD/qmlapplicationviewer.cpp HEADERS += $$PWD/qmlapplicationviewer.h diff --git a/demos/qmlweather/main.cpp b/demos/qmlweather/main.cpp index bef2f6a..10cd365 100644 --- a/demos/qmlweather/main.cpp +++ b/demos/qmlweather/main.cpp @@ -19,11 +19,7 @@ ****************************************************************************/ #include -#ifdef QT5_QUICK_1 - #include -#else - #include -#endif +#include #include #include "qmlapplicationviewer.h" diff --git a/demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.cpp index 862008b..a8f9aef 100644 --- a/demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -12,15 +12,9 @@ #include #include -#ifdef QT5_QUICK_1 - #include - #include - #include -#else - #include - #include - #include -#endif +#include +#include +#include #include #include // MEEGO_EDITION_HARMATTAN diff --git a/demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.pri index 40bf295..b6931d0 100644 --- a/demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.pri @@ -5,11 +5,7 @@ # It is recommended not to modify this file, since newer versions of Qt Creator # may offer an updated version of it. -greaterThan(QT_MAJOR_VERSION, 4) { - QT += quick1 -} else { - QT += declarative -} +QT += declarative SOURCES += $$PWD/qmlapplicationviewer.cpp HEADERS += $$PWD/qmlapplicationviewer.h diff --git a/examples/qmlpiechart/main.cpp b/examples/qmlpiechart/main.cpp index 768a62c..98a74c8 100644 --- a/examples/qmlpiechart/main.cpp +++ b/examples/qmlpiechart/main.cpp @@ -19,11 +19,7 @@ ****************************************************************************/ #include -#ifdef QT5_QUICK_1 - #include -#else - #include -#endif +#include #include "qmlapplicationviewer.h" Q_DECL_EXPORT int main(int argc, char *argv[]) diff --git a/examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.cpp b/examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.cpp index 426a19d..efbf1e3 100644 --- a/examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -12,16 +12,9 @@ #include #include -#ifdef QT5_QUICK_1 - #include - #include - #include -#else - #include - #include - #include -#endif - +#include +#include +#include #include #include // MEEGO_EDITION_HARMATTAN diff --git a/examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.h b/examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.h index 7f85658..9d0fea2 100644 --- a/examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.h +++ b/examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.h @@ -11,11 +11,7 @@ #ifndef QMLAPPLICATIONVIEWER_H #define QMLAPPLICATIONVIEWER_H -#ifdef QT5_QUICK_1 - #include -#else - #include -#endif +#include class QmlApplicationViewer : public QDeclarativeView { diff --git a/examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.pri b/examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.pri index 830526b..567c6dc 100644 --- a/examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.pri @@ -1,8 +1,4 @@ -greaterThan(QT_MAJOR_VERSION, 4) { - QT += quick1 -} else { - QT += declarative -} +QT += declarative SOURCES += $$PWD/qmlapplicationviewer.cpp HEADERS += $$PWD/qmlapplicationviewer.h diff --git a/plugins/declarative/declarative.pro b/plugins/declarative/declarative.pro index 1269fd3..68fd278 100644 --- a/plugins/declarative/declarative.pro +++ b/plugins/declarative/declarative.pro @@ -3,11 +3,7 @@ } TARGET = qtcommercialchartqml -greaterThan(QT_MAJOR_VERSION, 4) { - QT += quick1 -} else { - QT += declarative -} +QT += declarative DESTDIR = $$CHART_BUILD_QML_PLUGIN_DIR INCLUDEPATH += $$CHART_BUILD_PRIVATE_HEADER_DIR diff --git a/plugins/declarative/declarativebarseries.h b/plugins/declarative/declarativebarseries.h index e4056e9..5274233 100644 --- a/plugins/declarative/declarativebarseries.h +++ b/plugins/declarative/declarativebarseries.h @@ -28,13 +28,8 @@ #include "qhorizontalstackedbarseries.h" #include "qhorizontalpercentbarseries.h" #include "qbarset.h" -#ifdef QT5_QUICK_1 - #include - #include -#else - #include - #include -#endif +#include +#include QTCOMMERCIALCHART_BEGIN_NAMESPACE diff --git a/plugins/declarative/declarativecategoryaxis.h b/plugins/declarative/declarativecategoryaxis.h index d06fc0b..7dc1b12 100644 --- a/plugins/declarative/declarativecategoryaxis.h +++ b/plugins/declarative/declarativecategoryaxis.h @@ -22,13 +22,8 @@ #define DECLARATIVECATEGORYAXIS_H #include "qcategoryaxis.h" -#ifdef QT5_QUICK_1 - #include - #include -#else - #include - #include -#endif +#include +#include QTCOMMERCIALCHART_BEGIN_NAMESPACE diff --git a/plugins/declarative/declarativechart.h b/plugins/declarative/declarativechart.h index 5b9ca8e..fdb419f 100644 --- a/plugins/declarative/declarativechart.h +++ b/plugins/declarative/declarativechart.h @@ -22,11 +22,8 @@ #define DECLARATIVECHART_H #include -#ifdef QT5_QUICK_1 - #include -#else - #include -#endif +#include + #include "qchart.h" QTCOMMERCIALCHART_BEGIN_NAMESPACE @@ -121,7 +118,7 @@ public: qreal leftMargin(); qreal rightMargin(); void createDefaultAxes(QAbstractSeries *series); - //TODO this is depreciated: + //TODO this is deprecated: DeclarativeMargins *minimumMargins() { return m_margins; } Q_REVISION(2) DeclarativeMargins *margins() { return m_margins; } diff --git a/plugins/declarative/declarativelineseries.h b/plugins/declarative/declarativelineseries.h index 3365000..655d89d 100644 --- a/plugins/declarative/declarativelineseries.h +++ b/plugins/declarative/declarativelineseries.h @@ -23,13 +23,8 @@ #include "qlineseries.h" #include "declarativexyseries.h" -#ifdef QT5_QUICK_1 - #include - #include -#else - #include - #include -#endif +#include +#include QTCOMMERCIALCHART_BEGIN_NAMESPACE diff --git a/plugins/declarative/declarativepieseries.h b/plugins/declarative/declarativepieseries.h index 9a6c981..34fe4bf 100644 --- a/plugins/declarative/declarativepieseries.h +++ b/plugins/declarative/declarativepieseries.h @@ -22,13 +22,8 @@ #define DECLARATIVEPIESERIES_H #include "qpieseries.h" -#ifdef QT5_QUICK_1 - #include - #include -#else - #include - #include -#endif +#include +#include QTCOMMERCIALCHART_BEGIN_NAMESPACE class QPieSlice; diff --git a/plugins/declarative/declarativescatterseries.h b/plugins/declarative/declarativescatterseries.h index 4188f2f..0159ed4 100644 --- a/plugins/declarative/declarativescatterseries.h +++ b/plugins/declarative/declarativescatterseries.h @@ -23,13 +23,8 @@ #include "qscatterseries.h" #include "declarativexyseries.h" -#ifdef QT5_QUICK_1 - #include - #include -#else - #include - #include -#endif +#include +#include QTCOMMERCIALCHART_BEGIN_NAMESPACE diff --git a/plugins/declarative/declarativesplineseries.h b/plugins/declarative/declarativesplineseries.h index 6c198d1..4beb90b 100644 --- a/plugins/declarative/declarativesplineseries.h +++ b/plugins/declarative/declarativesplineseries.h @@ -23,13 +23,8 @@ #include "qsplineseries.h" #include "declarativexyseries.h" -#ifdef QT5_QUICK_1 - #include - #include -#else - #include - #include -#endif +#include +#include QTCOMMERCIALCHART_BEGIN_NAMESPACE diff --git a/plugins/declarative/plugin.cpp b/plugins/declarative/plugin.cpp index 7b30e06..49fd1d4 100644 --- a/plugins/declarative/plugin.cpp +++ b/plugins/declarative/plugin.cpp @@ -18,13 +18,6 @@ ** ****************************************************************************/ -#ifdef QT5_QUICK_1 - #include - #include -#else - #include - #include -#endif #include "qchart.h" #include "qabstractaxis.h" #include "qvalueaxis.h" @@ -45,11 +38,12 @@ #include "qhbarmodelmapper.h" #include "qvbarmodelmapper.h" #include "declarativemargins.h" -#include - #ifndef QT_ON_ARM -#include "qdatetimeaxis.h" + #include "qdatetimeaxis.h" #endif +#include +#include +#include QTCOMMERCIALCHART_USE_NAMESPACE @@ -62,9 +56,8 @@ class ChartQmlPlugin : public QDeclarativeExtensionPlugin { Q_OBJECT -#ifdef QT5_QUICK_1 - // TODO: fix the metadata - Q_PLUGIN_METADATA(IID "org.qt-project.foo") +#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDeclarativeExtensionInterface") #endif public: @@ -153,6 +146,6 @@ QTCOMMERCIALCHART_END_NAMESPACE QTCOMMERCIALCHART_USE_NAMESPACE -#ifndef QT5_QUICK_1 +#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0)) Q_EXPORT_PLUGIN2(qtcommercialchartqml, QT_PREPEND_NAMESPACE(ChartQmlPlugin)) #endif diff --git a/plugins/designer/qchartsplugin.cpp b/plugins/designer/qchartsplugin.cpp index 2806f0d..d804d76 100644 --- a/plugins/designer/qchartsplugin.cpp +++ b/plugins/designer/qchartsplugin.cpp @@ -84,7 +84,7 @@ QWidget *QChartsPlugin::createWidget(QWidget *parent) return new QChartView(new QChart(), parent); } -#ifndef QT5_QUICK_1 +#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0)) Q_EXPORT_PLUGIN2(qtcommercialchart, QChartsPlugin) #endif diff --git a/plugins/designer/qchartsplugin.h b/plugins/designer/qchartsplugin.h index 8121cb0..daecbf4 100644 --- a/plugins/designer/qchartsplugin.h +++ b/plugins/designer/qchartsplugin.h @@ -26,8 +26,8 @@ class QChartsPlugin: public QObject, public QDesignerCustomWidgetInterface { -#ifdef QT5_QUICK_1 - Q_PLUGIN_METADATA(IID "org.qt-project.bar") +#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface") #endif Q_OBJECT diff --git a/tests/auto/chartdataset/tst_chartdataset.cpp b/tests/auto/chartdataset/tst_chartdataset.cpp index 5773aed..f7d3234 100644 --- a/tests/auto/chartdataset/tst_chartdataset.cpp +++ b/tests/auto/chartdataset/tst_chartdataset.cpp @@ -31,11 +31,7 @@ private Q_SLOTS: void tst_ChartDataSet::skip() { -#ifdef QT5_QUICK_1 - QSKIP("This test requires the debug version of library"); -#else QSKIP("This test requires the debug version of library", SkipAll); -#endif } QTEST_MAIN(tst_ChartDataSet) @@ -73,32 +69,32 @@ class tst_ChartDataSet: public QObject { Q_OBJECT public Q_SLOTS: - void initTestCase(); - void cleanupTestCase(); - void init(); - void cleanup(); + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); private Q_SLOTS: - void chartdataset_data(); - void chartdataset(); - void addSeries_data(); - void addSeries(); + void chartdataset_data(); + void chartdataset(); + void addSeries_data(); + void addSeries(); void setAxisX_data(); void setAxisX(); void setAxisY_data(); void setAxisY(); - void removeSeries_data(); - void removeSeries(); - void removeAllSeries_data(); - void removeAllSeries(); + void removeSeries_data(); + void removeSeries(); + void removeAllSeries_data(); + void removeAllSeries(); void seriesCount_data(); - void seriesCount(); + void seriesCount(); void seriesIndex_data(); - void seriesIndex(); - void domain_data(); - void domain(); + void seriesIndex(); + void domain_data(); + void domain(); void zoomInDomain_data(); - void zoomInDomain(); + void zoomInDomain(); void zoomOutDomain_data(); void zoomOutDomain(); void scrollDomain_data(); @@ -111,7 +107,7 @@ private: void tst_ChartDataSet::initTestCase() { qRegisterMetaType(); - qRegisterMetaType(); + qRegisterMetaType(); qRegisterMetaType(); } @@ -140,20 +136,20 @@ void tst_ChartDataSet::chartdataset_data() void tst_ChartDataSet::chartdataset() { - QVERIFY(m_dataset->axisX(0) == 0); - QVERIFY(m_dataset->axisY(0) == 0); - QLineSeries* series = new QLineSeries(this); - QCOMPARE(m_dataset->seriesIndex(series),-1); - QVERIFY(m_dataset->domain(series) == 0); - QVERIFY(m_dataset->axisX(series) == 0); - QVERIFY(m_dataset->axisY(series) == 0); - m_dataset->createDefaultAxes(); + QVERIFY(m_dataset->axisX(0) == 0); + QVERIFY(m_dataset->axisY(0) == 0); + QLineSeries* series = new QLineSeries(this); + QCOMPARE(m_dataset->seriesIndex(series),-1); + QVERIFY(m_dataset->domain(series) == 0); + QVERIFY(m_dataset->axisX(series) == 0); + QVERIFY(m_dataset->axisY(series) == 0); + m_dataset->createDefaultAxes(); } void tst_ChartDataSet::addSeries_data() { - QTest::addColumn("series"); + QTest::addColumn("series"); QAbstractSeries* line = new QLineSeries(this); QAbstractSeries* area = new QAreaSeries(static_cast(line)); @@ -164,14 +160,14 @@ void tst_ChartDataSet::addSeries_data() QAbstractSeries* percent = new QPercentBarSeries(this); QAbstractSeries* stacked = new QStackedBarSeries(this); - QTest::newRow("line") << line; - QTest::newRow("area") << area; - QTest::newRow("scatter") << scatter; - QTest::newRow("spline") << spline; - QTest::newRow("pie") << pie; + QTest::newRow("line") << line; + QTest::newRow("area") << area; + QTest::newRow("scatter") << scatter; + QTest::newRow("spline") << spline; + QTest::newRow("pie") << pie; QTest::newRow("bar") << bar; - QTest::newRow("percent") << percent; - QTest::newRow("stacked") << stacked; + QTest::newRow("percent") << percent; + QTest::newRow("stacked") << stacked; } void tst_ChartDataSet::addSeries() diff --git a/tests/auto/domain/tst_domain.cpp b/tests/auto/domain/tst_domain.cpp index e4cd994..3e40463 100644 --- a/tests/auto/domain/tst_domain.cpp +++ b/tests/auto/domain/tst_domain.cpp @@ -32,11 +32,7 @@ private Q_SLOTS: void tst_Domain::skip() { -#ifdef QT5_QUICK_1 - QSKIP("This test requires the debug version of library"); -#else QSKIP("This test requires the debug version of library", SkipAll); -#endif } QTEST_MAIN(tst_Domain) diff --git a/tests/auto/inc/tst_definitions.h b/tests/auto/inc/tst_definitions.h index 08524db..1642256 100644 --- a/tests/auto/inc/tst_definitions.h +++ b/tests/auto/inc/tst_definitions.h @@ -50,20 +50,6 @@ namespace QTest // Some bamboo clients have trouble passing mouse events to the test application. // This can be used to skip those tests so that they don't show up as a failure // in the test report. -#ifdef QT5_QUICK_1 -#define SKIP_IF_CANNOT_TEST_MOUSE_EVENTS() { \ - do { \ - QPushButton b; \ - b.resize(100, 100); \ - b.show(); \ - QTest::qWaitForWindowShown(&b); \ - QSignalSpy spy(&b, SIGNAL(clicked())); \ - QTest::mouseClick(&b, Qt::LeftButton, 0, b.rect().center()); \ - if (spy.count() == 0) \ - QSKIP("Cannot test mouse events in this environment"); \ - } while (0); \ -} -#else #define SKIP_IF_CANNOT_TEST_MOUSE_EVENTS() { \ do { \ QPushButton b; \ @@ -76,6 +62,5 @@ namespace QTest QSKIP("Cannot test mouse events in this environment", SkipAll); \ } while (0); \ } -#endif #endif // TST_DEFINITIONS_H diff --git a/tests/auto/qabstractaxis/tst_qabstractaxis.cpp b/tests/auto/qabstractaxis/tst_qabstractaxis.cpp index 2979483..00dbfe1 100644 --- a/tests/auto/qabstractaxis/tst_qabstractaxis.cpp +++ b/tests/auto/qabstractaxis/tst_qabstractaxis.cpp @@ -139,11 +139,7 @@ void tst_QAbstractAxis::axisPenColor_data() void tst_QAbstractAxis::axisPenColor() { -#ifdef QT5_QUICK_1 - QSKIP("Test is not implemented. This is depreciated function"); -#else - QSKIP("Test is not implemented. This is depreciated function", SkipAll); -#endif + QSKIP("Test is not implemented. This is deprecated function", SkipAll); } void tst_QAbstractAxis::gridLinePen_data() @@ -408,11 +404,7 @@ void tst_QAbstractAxis::labelsColor_data() void tst_QAbstractAxis::labelsColor() { -#ifdef QT5_QUICK_1 - QSKIP("Test is not implemented. This is depreciated function"); -#else - QSKIP("Test is not implemented. This is depreciated function", SkipAll); -#endif + QSKIP("Test is not implemented. This is deprecated function", SkipAll); } void tst_QAbstractAxis::labelsFont_data() @@ -637,11 +629,7 @@ void tst_QAbstractAxis::shadesBorderColor_data() void tst_QAbstractAxis::shadesBorderColor() { -#ifdef QT5_QUICK_1 - QSKIP("Test is not implemented. This is depreciated function"); -#else - QSKIP("Test is not implemented. This is depreciated function", SkipAll); -#endif + QSKIP("Test is not implemented. This is deprecated function", SkipAll); } void tst_QAbstractAxis::shadesBrush_data() @@ -691,11 +679,7 @@ void tst_QAbstractAxis::shadesColor_data() // public QColor shadesColor() const void tst_QAbstractAxis::shadesColor() { -#ifdef QT5_QUICK_1 - QSKIP("Test is not implemented. This is depreciated function"); -#else - QSKIP("Test is not implemented. This is depreciated function", SkipAll); -#endif + QSKIP("Test is not implemented. This is deprecated function", SkipAll); } void tst_QAbstractAxis::shadesPen_data() diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro index 37397ab..144e5db 100644 --- a/tests/auto/qml/qml.pro +++ b/tests/auto/qml/qml.pro @@ -2,8 +2,4 @@ error( "Couldn't find the auto.pri file!" ) } SOURCES += tst_qml.cpp -greaterThan(QT_MAJOR_VERSION, 4) { - QT += quick1 -} else { - QT += declarative -} +QT += declarative diff --git a/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.cpp b/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.cpp index 05ba5a3..efbf1e3 100644 --- a/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -12,15 +12,9 @@ #include #include -#ifdef QT5_QUICK_1 - #include - #include - #include -#else - #include - #include - #include -#endif +#include +#include +#include #include #include // MEEGO_EDITION_HARMATTAN diff --git a/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.h b/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.h index 7f85658..9d0fea2 100644 --- a/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.h +++ b/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.h @@ -11,11 +11,7 @@ #ifndef QMLAPPLICATIONVIEWER_H #define QMLAPPLICATIONVIEWER_H -#ifdef QT5_QUICK_1 - #include -#else - #include -#endif +#include class QmlApplicationViewer : public QDeclarativeView { diff --git a/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.pri b/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.pri index 830526b..567c6dc 100644 --- a/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.pri @@ -1,8 +1,4 @@ -greaterThan(QT_MAJOR_VERSION, 4) { - QT += quick1 -} else { - QT += declarative -} +QT += declarative SOURCES += $$PWD/qmlapplicationviewer.cpp HEADERS += $$PWD/qmlapplicationviewer.h diff --git a/tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.cpp b/tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.cpp index 05ba5a3..efbf1e3 100644 --- a/tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -12,15 +12,9 @@ #include #include -#ifdef QT5_QUICK_1 - #include - #include - #include -#else - #include - #include - #include -#endif +#include +#include +#include #include #include // MEEGO_EDITION_HARMATTAN diff --git a/tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.h b/tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.h index 7f85658..9d0fea2 100644 --- a/tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.h +++ b/tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.h @@ -11,11 +11,7 @@ #ifndef QMLAPPLICATIONVIEWER_H #define QMLAPPLICATIONVIEWER_H -#ifdef QT5_QUICK_1 - #include -#else - #include -#endif +#include class QmlApplicationViewer : public QDeclarativeView { diff --git a/tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.pri b/tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.pri index 830526b..567c6dc 100644 --- a/tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.pri @@ -1,8 +1,4 @@ -greaterThan(QT_MAJOR_VERSION, 4) { - QT += quick1 -} else { - QT += declarative -} +QT += declarative SOURCES += $$PWD/qmlapplicationviewer.cpp HEADERS += $$PWD/qmlapplicationviewer.h