HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2680:743754a36d25

Fix build for iOS and for building the QtQuick 2 plugin statically...

Andy Shaw -

r2680:743754a36d25

parent child

Context file:

r2680:743754a36d25

Collapse all files

config.pri +3 -2

             ##################### LIB #################################################
             LIBRARY_NAME = QtCommercialChart
+            ios:CONFIG(iphonesimulator, iphonesimulator|iphoneos):LIBRARY_NAME = $$join(LIBRARY_NAME,,,_iphonesimulator)
             CONFIG(debug, debug|release) {
                 mac: LIBRARY_NAME = $$join(LIBRARY_NAME,,,_debug)
                 win32: LIBRARY_NAME = $$join(LIBRARY_NAME,,,d)
             }
             LIBS += -l$$LIBRARY_NAME
             # This will undefine Q_DECL_EXPORT/Q_DECL_IMPORT at qchartglobal.h
             # They should not be used for staticlib builds.
-            staticlib:DEFINES+=QTCOMMERCIALCHART_STATICLIB
+            static|staticlib:DEFINES+=QTCOMMERCIALCHART_STATICLIB
             #################### COVERAGE #################################################################
             coverage: CONFIG += debug
             ##################### SHADOW CONFIG #################################################
             !contains($${PWD}, $${OUT_PWD}){
                 search = "$$PWD:::"
                 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
             }else{
                 SHADOW=$$PWD
                 CONFIG-=development_build
             }
             ##################### BUILD PATHS ##################################################
             CHART_BUILD_PUBLIC_HEADER_DIR = $$SHADOW/include
             CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private
             CHART_BUILD_LIB_DIR = $$SHADOW/lib
             CHART_BUILD_DIR = $$SHADOW/build
             CHART_BUILD_BIN_DIR = $$SHADOW/bin
             CHART_BUILD_QML_PLUGIN_DIR = $$CHART_BUILD_BIN_DIR
             CHART_BUILD_QML2_PLUGIN_DIR = $$CHART_BUILD_QML_PLUGIN_DIR
             CHART_BUILD_DESIGNER_PLUGIN_DIR = $$CHART_BUILD_LIB_DIR
             CHART_BUILD_DOC_DIR = $$SHADOW/doc
             CONFIG(release,debug|release){
                 CHART_BUILD_LIB_DIR = $$CHART_BUILD_LIB_DIR/release
                 CHART_BUILD_BIN_DIR = $$CHART_BUILD_BIN_DIR/release
                 CHART_BUILD_QML_PLUGIN_DIR = $$CHART_BUILD_QML_PLUGIN_DIR/release/imports/QtCommercial/Chart
                 CHART_BUILD_QML2_PLUGIN_DIR = $$CHART_BUILD_QML2_PLUGIN_DIR/release/qml/QtCommercial/Chart
                 CHART_BUILD_DESIGNER_PLUGIN_DIR = $$CHART_BUILD_LIB_DIR
             }
             CONFIG(debug,debug|release){
                CHART_BUILD_LIB_DIR = $$CHART_BUILD_LIB_DIR/debug
                CHART_BUILD_BIN_DIR = $$CHART_BUILD_BIN_DIR/debug
                CHART_BUILD_QML_PLUGIN_DIR = $$CHART_BUILD_QML_PLUGIN_DIR/debug/imports/QtCommercial/Chart
                CHART_BUILD_QML2_PLUGIN_DIR = $$CHART_BUILD_QML2_PLUGIN_DIR/debug/qml/QtCommercial/Chart
                CHART_BUILD_DESIGNER_PLUGIN_DIR = $$CHART_BUILD_LIB_DIR
             }
             # Use own folders for debug and release builds
             CONFIG(debug, debug|release):CHART_BUILD_DIR = $$join(CHART_BUILD_DIR,,,/debug)
             CONFIG(release, debug|release): CHART_BUILD_DIR = $$join(CHART_BUILD_DIR,,,/release)
             contains(QMAKE_HOST.os, Windows) {
                 CHART_BUILD_PUBLIC_HEADER_DIR = $$replace(CHART_BUILD_PUBLIC_HEADER_DIR, "/","\\")
                 CHART_BUILD_PRIVATE_HEADER_DIR = $$replace(CHART_BUILD_PRIVATE_HEADER_DIR, "/","\\")
                 CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\")
                 CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\")
                 CHART_BUILD_QML_PLUGIN_DIR = $$replace(CHART_BUILD_QML_PLUGIN_DIR, "/","\\")
                 CHART_BUILD_QML2_PLUGIN_DIR = $$replace(CHART_BUILD_QML2_PLUGIN_DIR, "/","\\")
                 CHART_BUILD_DESIGNER_PLUGIN_DIR = $$replace(CHART_BUILD_DESIGNER_PLUGIN_DIR, "/","\\")
                 CHART_BUILD_DOC_DIR = $$replace(CHART_BUILD_DOC_DIR, "/","\\")
                 CHART_BUILD_LIB_DIR = $$replace(CHART_BUILD_LIB_DIR, "/","\\")
             }
-            macx: {
+            macx:!ios {
                 # Some Qt versions use an incompatible configuration on OSX which makes the build fail.
                 # As a work-around, set the minimum OSX version to 10.5.
                 QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5
                 QMAKE_LFLAGS *= -mmacosx-version-min=10.5
             }
             linux-arm*: {
                 DEFINES+=QT_ON_ARM
             }
             ##################### INCLUDES ############################################################
             INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR $$[QT_INSTALL_HEADERS]/QtCommercialChart
             !exists($$CHART_BUILD_LIB_DIR) {
                 system($$QMAKE_MKDIR $$CHART_BUILD_LIB_DIR)
             }
             !win32: {
                 LIBS += -L$$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
             } else {
                 win32-msvc*: {
                     # hack fix for error:
                     #   "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'"
                     QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR
                 } else {
                     LIBS += -L$$CHART_BUILD_LIB_DIR
                 }
             }
             LIBS += -L$$[QT_INSTALL_LIBS]
             ##################### DEVELOPMENT BUILD ###################################################
             development_build: {
                 DEFINES+=DEVELOPMENT_BUILD
                 CONFIG+=debug_and_release
                 CONFIG+=build_all
             }
             ##################### UNIT TESTS ##############################################################
             CONFIG(debug, debug|release) {
                 DEFINES+=BUILD_PRIVATE_UNIT_TESTS
             }

demos/demos.pri +2 -1

             !include( ../config.pri ) {
              error( "Couldn't find the config.pri file!" )
             }
             DESTDIR = $$CHART_BUILD_BIN_DIR
+            !ios {
             OBJECTS_DIR = $$CHART_BUILD_DIR/demos/$$TARGET
             MOC_DIR = $$CHART_BUILD_DIR/demos/$$TARGET
             UI_DIR = $$CHART_BUILD_DIR/demos/$$TARGET
             RCC_DIR = $$CHART_BUILD_DIR/demos/$$TARGET
+            }
             TEMPLATE = app
             QT += core gui
             greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
             # staticlib config causes problems when building executables
             staticlib: CONFIG-=staticlib
             android {
                 # Workaround to fix android deployment, which seems to always look for target in
                 # OUT_PWD instead of DESTDIR.
                 COPY_PARAMETERS = "$$CHART_BUILD_BIN_DIR/lib$${TARGET}.so $$OUT_PWD/lib$${TARGET}.so"
                 contains(QMAKE_HOST.os, Windows): COPY_PARAMETERS = $$replace(COPY_PARAMETERS, "/","\\")
                 QMAKE_POST_LINK += $$QMAKE_COPY $$COPY_PARAMETERS
                 contains(TARGET, qml.*) {
                     charts_qmldir.files = $$CHART_BUILD_QML_PLUGIN_DIR/qmldir
                     charts_qmldir.path = /assets/imports/QtCommercial/Chart
                     charts_qmlplugin.files = $$CHART_BUILD_QML_PLUGIN_DIR/libqtcommercialchartqml.so
                     charts_qmlplugin.path = /libs/$$ANDROID_TARGET_ARCH
                     INSTALLS += charts_qmldir charts_qmlplugin
                 } else:contains(TARGET, quick2.*) {
                     charts_qmldir.files = $$CHART_BUILD_QML2_PLUGIN_DIR/qmldir
                     charts_qmldir.path = /assets/qml/QtCommercial/Chart
                     charts_qmlplugin.files = $$CHART_BUILD_QML2_PLUGIN_DIR/libqtcommercialchartqml2.so
                     charts_qmlplugin.path = /libs/$$ANDROID_TARGET_ARCH
                     INSTALLS += charts_qmldir charts_qmlplugin
                 }
             }

examples/examples.pri +2 -1

             !include( ../config.pri ) {
              error( "Couldn't find the config.pri file!" )
             }
             DESTDIR = $$CHART_BUILD_BIN_DIR
+            !ios {
             OBJECTS_DIR = $$CHART_BUILD_DIR/examples/$$TARGET
             MOC_DIR = $$CHART_BUILD_DIR/examples/$$TARGET
             UI_DIR = $$CHART_BUILD_DIR/examples/$$TARGET
             RCC_DIR = $$CHART_BUILD_DIR/examples/$$TARGET
+            }
             TEMPLATE = app
             QT += core gui
             greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
             # staticlib config causes problems when building executables
             staticlib: CONFIG-=staticlib
             android {
                 # Workaround to fix android deployment, which seems to always look for target in
                 # OUT_PWD instead of DESTDIR.
                 COPY_PARAMETERS = "$$CHART_BUILD_BIN_DIR/lib$${TARGET}.so $$OUT_PWD/lib$${TARGET}.so"
                 contains(QMAKE_HOST.os, Windows): COPY_PARAMETERS = $$replace(COPY_PARAMETERS, "/","\\")
                 QMAKE_POST_LINK += $$QMAKE_COPY $$COPY_PARAMETERS
                 contains(TARGET, qml.*) {
                     charts_qmldir.files = $$CHART_BUILD_QML_PLUGIN_DIR/qmldir
                     charts_qmldir.path = /assets/imports/QtCommercial/Chart
                     charts_qmlplugin.files = $$CHART_BUILD_QML_PLUGIN_DIR/libqtcommercialchartqml.so
                     charts_qmlplugin.path = /libs/$$ANDROID_TARGET_ARCH
                     INSTALLS += charts_qmldir charts_qmlplugin
                 }
             }

plugins/declarative/declarative.pri +1 -1

             !include( ../plugins.pri ) {
                 error( "Couldn't find the plugins.pri file!" )
             }
             contains(DEFINES, CHARTS_FOR_QUICK2) {
                 DESTDIR = $$CHART_BUILD_QML2_PLUGIN_DIR
             } else {
                 DESTDIR = $$CHART_BUILD_QML_PLUGIN_DIR
             }
             INCLUDEPATH += $$CHART_BUILD_PRIVATE_HEADER_DIR
+            ios:CONFIG(iphonesimulator, iphonesimulator|iphoneos):TARGET = $$join(TARGET,,,_iphonesimulator)
             CONFIG(debug, debug|release) {
               mac: TARGET = $$join(TARGET,,,_debug)
               win32: TARGET = $$join(TARGET,,,d)
             }
             SOURCES += \
                 ../declarative/plugin.cpp \
                 ../declarative/declarativechart.cpp \
                 ../declarative/declarativexypoint.cpp \
                 ../declarative/declarativexyseries.cpp \
                 ../declarative/declarativelineseries.cpp \
                 ../declarative/declarativesplineseries.cpp \
                 ../declarative/declarativeareaseries.cpp \
                 ../declarative/declarativescatterseries.cpp \
                 ../declarative/declarativepieseries.cpp \
                 ../declarative/declarativebarseries.cpp \
                 ../declarative/declarativecategoryaxis.cpp \
                 ../declarative/declarativemargins.cpp \
                 ../declarative/declarativeaxes.cpp \
                 ../declarative/declarativepolarchart.cpp \
                 ../declarative/declarativeboxplotseries.cpp
             HEADERS += \
                 ../declarative/declarativechart.h \
                 ../declarative/declarativexypoint.h \
                 ../declarative/declarativexyseries.h \
                 ../declarative/declarativelineseries.h \
                 ../declarative/declarativesplineseries.h \
                 ../declarative/declarativeareaseries.h \
                 ../declarative/declarativescatterseries.h \
                 ../declarative/declarativepieseries.h \
                 ../declarative/declarativebarseries.h \
                 ../declarative/declarativecategoryaxis.h \
                 ../declarative/declarativemargins.h \
                 ../declarative/declarativeaxes.h \
                 ../declarative/declarativepolarchart.h \
                 ../declarative/shared_defines.h \
                 ../declarative/declarativeboxplotseries.h
             TARGETPATH = QtCommercial/Chart
             target.path = $$IMPORT_INSTALL_PATH/$$TARGETPATH
             qmldir.files += $$_PRO_FILE_PWD_/qmldir
             qmldir.path +=  $$IMPORT_INSTALL_PATH/$$TARGETPATH
             INSTALLS += target qmldir
             QMLDIR_FILE = $$_PRO_FILE_PWD_/qmldir
             contains(QMAKE_HOST.os, Windows): QMLDIR_FILE = $$replace(QMLDIR_FILE, "/","\\")
             QMAKE_POST_LINK += $$QMAKE_COPY $$QMLDIR_FILE $$DESTDIR

plugins/declarative/plugin.cpp +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Enterprise Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Enterprise licenses may use this file in
             ** accordance with the Qt Enterprise License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "qchart.h"
             #include "qabstractaxis.h"
             #include "qvalueaxis.h"
             #include "qlogvalueaxis.h"
             #include "declarativecategoryaxis.h"
             #include "qbarcategoryaxis.h"
             #include "declarativechart.h"
             #include "declarativepolarchart.h"
             #include "declarativexypoint.h"
             #include "declarativelineseries.h"
             #include "declarativesplineseries.h"
             #include "declarativeareaseries.h"
             #include "declarativescatterseries.h"
             #include "declarativebarseries.h"
             #include "declarativeboxplotseries.h"
             #include "declarativepieseries.h"
             #include "declarativeaxes.h"
             #include "qvxymodelmapper.h"
             #include "qhxymodelmapper.h"
             #include "qhpiemodelmapper.h"
             #include "qvpiemodelmapper.h"
             #include "qhbarmodelmapper.h"
             #include "qvbarmodelmapper.h"
             #include "declarativemargins.h"
             #include "qarealegendmarker.h"
             #include "qbarlegendmarker.h"
             #include "qpielegendmarker.h"
             #include "qxylegendmarker.h"
             #ifndef QT_ON_ARM
                 #include "qdatetimeaxis.h"
             #endif
             #include "shared_defines.h"
             #include <QAbstractItemModel>
             #ifdef CHARTS_FOR_QUICK2
             #include <QtQml/QQmlExtensionPlugin>
             #else
             #include <QtDeclarative/qdeclarativeextensionplugin.h>
             #include <QtDeclarative/qdeclarative.h>
             #endif
             QTCOMMERCIALCHART_USE_NAMESPACE
             Q_DECLARE_METATYPE(QList<QPieSlice *>)
             Q_DECLARE_METATYPE(QList<QBarSet *>)
             Q_DECLARE_METATYPE(QList<QAbstractAxis *>)
             #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
             Q_DECLARE_METATYPE(DeclarativeChart *)
             Q_DECLARE_METATYPE(DeclarativePolarChart *)
             Q_DECLARE_METATYPE(DeclarativeMargins *)
             Q_DECLARE_METATYPE(DeclarativeAreaSeries *)
             Q_DECLARE_METATYPE(DeclarativeBarSeries *)
             Q_DECLARE_METATYPE(DeclarativeBarSet *)
             Q_DECLARE_METATYPE(DeclarativeBoxPlotSeries *)
             Q_DECLARE_METATYPE(DeclarativeBoxSet *)
             Q_DECLARE_METATYPE(DeclarativeLineSeries *)
             Q_DECLARE_METATYPE(DeclarativePieSeries *)
             Q_DECLARE_METATYPE(DeclarativeScatterSeries *)
             Q_DECLARE_METATYPE(DeclarativeSplineSeries *)
             Q_DECLARE_METATYPE(QAbstractAxis *)
             Q_DECLARE_METATYPE(QValueAxis *)
             Q_DECLARE_METATYPE(QBarCategoryAxis *)
             Q_DECLARE_METATYPE(QCategoryAxis *)
             Q_DECLARE_METATYPE(QDateTimeAxis *)
             Q_DECLARE_METATYPE(QLogValueAxis *)
             Q_DECLARE_METATYPE(QLegend *)
             Q_DECLARE_METATYPE(QLegendMarker *)
             Q_DECLARE_METATYPE(QAreaLegendMarker *)
             Q_DECLARE_METATYPE(QBarLegendMarker *)
             Q_DECLARE_METATYPE(QPieLegendMarker *)
             Q_DECLARE_METATYPE(QHPieModelMapper *)
             Q_DECLARE_METATYPE(QHXYModelMapper *)
             Q_DECLARE_METATYPE(QPieModelMapper *)
             Q_DECLARE_METATYPE(QHBarModelMapper *)
             Q_DECLARE_METATYPE(QBarModelMapper *)
             Q_DECLARE_METATYPE(QVBarModelMapper *)
             Q_DECLARE_METATYPE(QVPieModelMapper *)
             Q_DECLARE_METATYPE(QVXYModelMapper *)
             Q_DECLARE_METATYPE(QXYLegendMarker *)
             Q_DECLARE_METATYPE(QXYModelMapper *)
             Q_DECLARE_METATYPE(QAbstractSeries *)
             Q_DECLARE_METATYPE(QXYSeries *)
             Q_DECLARE_METATYPE(QAbstractBarSeries *)
             Q_DECLARE_METATYPE(QBarSeries *)
             Q_DECLARE_METATYPE(QBarSet *)
             Q_DECLARE_METATYPE(QAreaSeries *)
             Q_DECLARE_METATYPE(QHorizontalBarSeries *)
             Q_DECLARE_METATYPE(QHorizontalPercentBarSeries *)
             Q_DECLARE_METATYPE(QHorizontalStackedBarSeries *)
             Q_DECLARE_METATYPE(QLineSeries *)
             Q_DECLARE_METATYPE(QPercentBarSeries *)
             Q_DECLARE_METATYPE(QPieSeries *)
             Q_DECLARE_METATYPE(QPieSlice *)
             Q_DECLARE_METATYPE(QScatterSeries *)
             Q_DECLARE_METATYPE(QSplineSeries *)
             Q_DECLARE_METATYPE(QStackedBarSeries *)
             #endif
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartQmlPlugin : public QDECLARATIVE_EXTENSION_PLUGIN
             {
                 Q_OBJECT
             #ifdef CHARTS_FOR_QUICK2
                 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
             #else
             # if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
                 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDeclarativeExtensionInterface")
             # endif
             #endif
             public:
                 virtual void registerTypes(const char *uri)
                 {
                     Q_ASSERT(QLatin1String(uri) == QLatin1String("QtCommercial.Chart"));
                     qRegisterMetaType<QList<QPieSlice *> >();
                     qRegisterMetaType<QList<QBarSet *> >();
                     qRegisterMetaType<QList<QAbstractAxis *> >();
                     // QtCommercial.Chart 1.0
                     qmlRegisterType<DeclarativeChart>(uri, 1, 0, "ChartView");
                     qmlRegisterType<DeclarativeXYPoint>(uri, 1, 0, "XYPoint");
                     qmlRegisterType<DeclarativeScatterSeries>(uri, 1, 0, "ScatterSeries");
                     qmlRegisterType<DeclarativeLineSeries>(uri, 1, 0, "LineSeries");
                     qmlRegisterType<DeclarativeSplineSeries>(uri, 1, 0, "SplineSeries");
                     qmlRegisterType<DeclarativeAreaSeries>(uri, 1, 0, "AreaSeries");
                     qmlRegisterType<DeclarativeBarSeries>(uri, 1, 0, "BarSeries");
                     qmlRegisterType<DeclarativeStackedBarSeries>(uri, 1, 0, "StackedBarSeries");
                     qmlRegisterType<DeclarativePercentBarSeries>(uri, 1, 0, "PercentBarSeries");
                     qmlRegisterType<DeclarativePieSeries>(uri, 1, 0, "PieSeries");
                     qmlRegisterType<QPieSlice>(uri, 1, 0, "PieSlice");
                     qmlRegisterType<DeclarativeBarSet>(uri, 1, 0, "BarSet");
                     qmlRegisterType<QHXYModelMapper>(uri, 1, 0, "HXYModelMapper");
                     qmlRegisterType<QVXYModelMapper>(uri, 1, 0, "VXYModelMapper");
                     qmlRegisterType<QHPieModelMapper>(uri, 1, 0, "HPieModelMapper");
                     qmlRegisterType<QVPieModelMapper>(uri, 1, 0, "VPieModelMapper");
                     qmlRegisterType<QHBarModelMapper>(uri, 1, 0, "HBarModelMapper");
                     qmlRegisterType<QVBarModelMapper>(uri, 1, 0, "VBarModelMapper");
                     qmlRegisterType<QValueAxis>(uri, 1, 0, "ValuesAxis");
                     qmlRegisterType<QBarCategoryAxis>(uri, 1, 0, "BarCategoriesAxis");
                     qmlRegisterUncreatableType<QLegend>(uri, 1, 0, "Legend",
                                                         QLatin1String("Trying to create uncreatable: Legend."));
                     qmlRegisterUncreatableType<QXYSeries>(uri, 1, 0, "XYSeries",
                                                           QLatin1String("Trying to create uncreatable: XYSeries."));
                     qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 0, "AbstractItemModel",
                                                                    QLatin1String("Trying to create uncreatable: AbstractItemModel."));
                     qmlRegisterUncreatableType<QXYModelMapper>(uri, 1, 0, "XYModelMapper",
                                                                QLatin1String("Trying to create uncreatable: XYModelMapper."));
                     qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 0, "PieModelMapper",
                                                                 QLatin1String("Trying to create uncreatable: PieModelMapper."));
                     qmlRegisterUncreatableType<QBarModelMapper>(uri, 1, 0, "BarModelMapper",
                                                                 QLatin1String("Trying to create uncreatable: BarModelMapper."));
                     qmlRegisterUncreatableType<QAbstractSeries>(uri, 1, 0, "AbstractSeries",
                                                                 QLatin1String("Trying to create uncreatable: AbstractSeries."));
                     qmlRegisterUncreatableType<QAbstractBarSeries>(uri, 1, 0, "AbstractBarSeries",
                                                                    QLatin1String("Trying to create uncreatable: AbstractBarSeries."));
                     qmlRegisterUncreatableType<QAbstractAxis>(uri, 1, 0, "AbstractAxis",
                                                               QLatin1String("Trying to create uncreatable: AbstractAxis. Use specific types of axis instead."));
                     qmlRegisterUncreatableType<QBarSet>(uri, 1, 0, "BarSetBase",
                                                         QLatin1String("Trying to create uncreatable: BarsetBase."));
                     qmlRegisterUncreatableType<QPieSeries>(uri, 1, 0, "QPieSeries",
                                                            QLatin1String("Trying to create uncreatable: QPieSeries. Use PieSeries instead."));
                     qmlRegisterUncreatableType<DeclarativeAxes>(uri, 1, 0, "DeclarativeAxes",
                                                            QLatin1String("Trying to create uncreatable: DeclarativeAxes."));
                     // QtCommercial.Chart 1.1
                     qmlRegisterType<DeclarativeChart, 1>(uri, 1, 1, "ChartView");
                     qmlRegisterType<DeclarativeScatterSeries, 1>(uri, 1, 1, "ScatterSeries");
                     qmlRegisterType<DeclarativeLineSeries, 1>(uri, 1, 1, "LineSeries");
                     qmlRegisterType<DeclarativeSplineSeries, 1>(uri, 1, 1, "SplineSeries");
                     qmlRegisterType<DeclarativeAreaSeries, 1>(uri, 1, 1, "AreaSeries");
                     qmlRegisterType<DeclarativeBarSeries, 1>(uri, 1, 1, "BarSeries");
                     qmlRegisterType<DeclarativeStackedBarSeries, 1>(uri, 1, 1, "StackedBarSeries");
                     qmlRegisterType<DeclarativePercentBarSeries, 1>(uri, 1, 1, "PercentBarSeries");
                     qmlRegisterType<DeclarativeHorizontalBarSeries, 1>(uri, 1, 1, "HorizontalBarSeries");
                     qmlRegisterType<DeclarativeHorizontalStackedBarSeries, 1>(uri, 1, 1, "HorizontalStackedBarSeries");
                     qmlRegisterType<DeclarativeHorizontalPercentBarSeries, 1>(uri, 1, 1, "HorizontalPercentBarSeries");
                     qmlRegisterType<DeclarativePieSeries>(uri, 1, 1, "PieSeries");
                     qmlRegisterType<DeclarativeBarSet>(uri, 1, 1, "BarSet");
                     qmlRegisterType<QValueAxis>(uri, 1, 1, "ValueAxis");
             #ifndef QT_ON_ARM
                     qmlRegisterType<QDateTimeAxis>(uri, 1, 1, "DateTimeAxis");
             #endif
                     qmlRegisterType<DeclarativeCategoryAxis>(uri, 1, 1, "CategoryAxis");
                     qmlRegisterType<DeclarativeCategoryRange>(uri, 1, 1, "CategoryRange");
                     qmlRegisterType<QBarCategoryAxis>(uri, 1, 1, "BarCategoryAxis");
                     qmlRegisterUncreatableType<DeclarativeMargins>(uri, 1, 1, "Margins",
                                                                    QLatin1String("Trying to create uncreatable: Margins."));
                     // QtCommercial.Chart 1.2
                     qmlRegisterType<DeclarativeChart, 2>(uri, 1, 2, "ChartView");
                     qmlRegisterType<DeclarativeScatterSeries, 2>(uri, 1, 2, "ScatterSeries");
                     qmlRegisterType<DeclarativeLineSeries, 2>(uri, 1, 2, "LineSeries");
                     qmlRegisterType<DeclarativeSplineSeries, 2>(uri, 1, 2, "SplineSeries");
                     qmlRegisterType<DeclarativeAreaSeries, 2>(uri, 1, 2, "AreaSeries");
                     qmlRegisterType<DeclarativeBarSeries, 2>(uri, 1, 2, "BarSeries");
                     qmlRegisterType<DeclarativeStackedBarSeries, 2>(uri, 1, 2, "StackedBarSeries");
                     qmlRegisterType<DeclarativePercentBarSeries, 2>(uri, 1, 2, "PercentBarSeries");
                     qmlRegisterType<DeclarativeHorizontalBarSeries, 2>(uri, 1, 2, "HorizontalBarSeries");
                     qmlRegisterType<DeclarativeHorizontalStackedBarSeries, 2>(uri, 1, 2, "HorizontalStackedBarSeries");
                     qmlRegisterType<DeclarativeHorizontalPercentBarSeries, 2>(uri, 1, 2, "HorizontalPercentBarSeries");
                     // QtCommercial.Chart 1.3
                     qmlRegisterType<DeclarativeChart, 3>(uri, 1, 3, "ChartView");
                     qmlRegisterType<DeclarativePolarChart, 1>(uri, 1, 3, "PolarChartView");
                     qmlRegisterType<DeclarativeSplineSeries, 3>(uri, 1, 3, "SplineSeries");
                     qmlRegisterType<DeclarativeScatterSeries, 3>(uri, 1, 3, "ScatterSeries");
                     qmlRegisterType<DeclarativeLineSeries, 3>(uri, 1, 3, "LineSeries");
                     qmlRegisterType<DeclarativeAreaSeries, 3>(uri, 1, 3, "AreaSeries");
                     qmlRegisterType<QLogValueAxis>(uri, 1, 3, "LogValueAxis");
                     qmlRegisterType<DeclarativeBoxPlotSeries>(uri, 1, 3, "BoxPlotSeries");
                     qmlRegisterType<DeclarativeBoxSet>(uri, 1, 3, "BoxSet");
                 }
             };
-            #include "plugin.moc"
             QTCOMMERCIALCHART_END_NAMESPACE
+            #include "plugin.moc"
             QTCOMMERCIALCHART_USE_NAMESPACE
             #if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
                 Q_EXPORT_PLUGIN2(qtcommercialchartqml, QT_PREPEND_NAMESPACE(ChartQmlPlugin))
             #endif

plugins/quick2/qmldir +1 0

             module QtCommercial.Chart
             plugin qtcommercialchartqml2
+            classname ChartQmlPlugin

plugins/quick2/quick2.pro +2 -1

             TARGET = qtcommercialchartqml2
             QT += quick qml widgets
             IMPORT_INSTALL_PATH = $$[QT_INSTALL_QML]
             DEFINES += CHARTS_FOR_QUICK2
             !include(../declarative/declarative.pri) {
                 error( "Couldn't find the declarative.pri file!" )
             }
             qmldir.files += plugins.qmltypes
+            TARGETPATH = QtCommercial.Chart
+            QMAKE_MOC_OPTIONS += -Muri=$$TARGETPATH

src/src.pro +1 -1

             !include( ../config.pri ):error( "Couldn't find the config.pri file!" )
             ############################# BUILD CONFIG ######################################
             TARGET = $$LIBRARY_NAME
             DESTDIR = $$CHART_BUILD_LIB_DIR
             TEMPLATE = lib
             QT = core gui
             greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
             DEFINES += QTCOMMERCIALCHART_LIBRARY
             win32:CONFIG += create_prl
             # treat warnings as errors
             win32-msvc*: {
                 QMAKE_CXXFLAGS += /WX
             } else {
             #    QMAKE_CXXFLAGS += -Werror
             }
             unix:!qnx:!android {
               QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
             }
             ############################# DEPEDENCES ########################################
             win32-msvc*: LIBS += User32.lib
             LIBS -= -l$$LIBRARY_NAME
             INCLUDEPATH += ../include .
             ############################# SOURCES ##########################################
             SOURCES += \
                 $$PWD/chartdataset.cpp \
                 $$PWD/chartpresenter.cpp \
                 $$PWD/chartthememanager.cpp \
                 $$PWD/qchart.cpp \
                 $$PWD/qchartview.cpp \
                 $$PWD/qabstractseries.cpp \
                 $$PWD/chartbackground.cpp \
                 $$PWD/chartelement.cpp \
                 $$PWD/chartitem.cpp \
                 $$PWD/scroller.cpp \
                 $$PWD/charttitle.cpp \
                 $$PWD/qpolarchart.cpp
             PRIVATE_HEADERS += \
                 $$PWD/chartdataset_p.h \
                 $$PWD/chartitem_p.h \
                 $$PWD/chartpresenter_p.h \
                 $$PWD/chartthememanager_p.h \
                 $$PWD/chartbackground_p.h \
                 $$PWD/chartelement_p.h \
                 $$PWD/chartconfig_p.h \
                 $$PWD/qchart_p.h \
                 $$PWD/qchartview_p.h \
                 $$PWD/scroller_p.h \
                 $$PWD/qabstractseries_p.h \
                 $$PWD/charttitle_p.h \
                 $$PWD/charthelpers_p.h
             PUBLIC_HEADERS += \
                 $$PWD/qchart.h \
                 $$PWD/qchartglobal.h \
                 $$PWD/qabstractseries.h \
                 $$PWD/qchartview.h \
                 $$PWD/chartsnamespace.h \
                 $$PWD/qpolarchart.h
             include(animations/animations.pri)
             include(areachart/areachart.pri)
             include(axis/axis.pri)
             include(domain/domain.pri)
             include(barchart/barchart.pri)
             include(legend/legend.pri)
             include(linechart/linechart.pri)
             include(piechart/piechart.pri)
             include(scatterchart/scatter.pri)
             include(splinechart/splinechart.pri)
             include(themes/themes.pri)
             include(xychart/xychart.pri)
             include(layout/layout.pri)
             include(boxplotchart/boxplotchart.pri)
             HEADERS += $$PUBLIC_HEADERS
             HEADERS += $$PRIVATE_HEADERS
             HEADERS += $$THEMES
             ############################# BUILD PATH ##########################################
             OBJECTS_DIR = $$CHART_BUILD_DIR/lib
             MOC_DIR = $$CHART_BUILD_DIR/lib
             UI_DIR = $$CHART_BUILD_DIR/lib
             RCC_DIR = $$CHART_BUILD_DIR/lib
             ############################# PUBLIC HEADERS GENERATOR ##########################################
             !exists($$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal)
             {
                 system($$QMAKE_MKDIR $$CHART_BUILD_PUBLIC_HEADER_DIR)
                  contains(QMAKE_HOST.os, Windows) {
                     command = "echo $${LITERAL_HASH}include \"qchartglobal.h\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal"
                 }else{
                     command = "echo \"$${LITERAL_HASH}include \\\"qchartglobal.h\\\"\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal"
                 }
                 PUBLIC_QT_HEADERS += $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal
                 system($$command)
             }
             for(file, PUBLIC_HEADERS) {
                 name = $$split(file,'/')
                 last_name = $$last(name)
                 class = "$$cat($$file)"
                 found_class = $$find(class,class)
                 !isEmpty(found_class){
                 split_class = $$split(found_class,QTCOMMERCIALCHART_EXPORT)
                 member_class = $$member(split_class,1)
                 member_split_class = $$split(member_class,' ')
                 modified_class = $$replace(member_split_class,' ','')
                 final_class = $$member(modified_class,0)
                 contains(QMAKE_HOST.os, Windows) {
                     command = "echo $${LITERAL_HASH}include \"$$last_name\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/$$final_class"
                 }else{
                     command = "echo \"$${LITERAL_HASH}include \\\"$$last_name\\\"\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/$$final_class"
                 }
                 PUBLIC_QT_HEADERS += $$CHART_BUILD_PUBLIC_HEADER_DIR/$$final_class
                 system($$command)
                 }
                 unset(name)
                 unset(last_name)
                 unset(class)
                 unset(found_class)
                 unset(split_class)
                 unset(member_class)
                 unset(member_split_class)
                 unset(modified_class)
                 unset(final_class)
             }
             ############################# INSTALLERS ##########################################
             public_headers.path = $$[QT_INSTALL_HEADERS]/QtCommercialChart
             public_headers.files = $$PUBLIC_HEADERS $$PUBLIC_QT_HEADERS
             INSTALLS += public_headers
             install_build_public_headers.name = build_public_headers
             install_build_public_headers.output = $$CHART_BUILD_PUBLIC_HEADER_DIR/${QMAKE_FILE_BASE}.h
             install_build_public_headers.input = PUBLIC_HEADERS
             install_build_public_headers.commands = $$QMAKE_COPY \
                 ${QMAKE_FILE_NAME} \
                 $$CHART_BUILD_PUBLIC_HEADER_DIR
             install_build_public_headers.CONFIG += target_predeps \
                 no_link
             install_build_private_headers.name = build_private_headers
             install_build_private_headers.output = $$CHART_BUILD_PRIVATE_HEADER_DIR/${QMAKE_FILE_BASE}.h
             install_build_private_headers.input = PRIVATE_HEADERS
             install_build_private_headers.commands = $$QMAKE_COPY \
                 ${QMAKE_FILE_NAME} \
                 $$CHART_BUILD_PRIVATE_HEADER_DIR
             install_build_private_headers.CONFIG += target_predeps \
                 no_link
             QMAKE_EXTRA_COMPILERS += install_build_public_headers \
                 install_build_private_headers \
             win32:{
                bintarget.CONFIG += no_check_exist
                !staticlib: {
                   bintarget.files += $$CHART_BUILD_LIB_DIR\\$${TARGET}.dll
                }
                win32-msvc*:CONFIG(debug, debug|release): {
                   bintarget.files += $$CHART_BUILD_LIB_DIR\\$${TARGET}.pdb
                }
                bintarget.path = $$[QT_INSTALL_BINS]
                libtarget.CONFIG += no_check_exist
                libtarget.files = $$CHART_BUILD_LIB_DIR\\$${TARGET}.prl
                win32-msvc*: {
                   libtarget.files += $$CHART_BUILD_LIB_DIR\\$${TARGET}.lib
                } else {
                   libtarget.files += $$CHART_BUILD_LIB_DIR\\lib$${TARGET}.a
                }
                libtarget.path = $$[QT_INSTALL_LIBS]
                DLLDESTDIR = $$CHART_BUILD_BIN_DIR
                INSTALLS += bintarget libtarget
             }else{
                target.path=$$[QT_INSTALL_LIBS]
                INSTALLS += target
             }
-            mac: !staticlib: {
+            mac: !static:!staticlib {
                 # Update the name (id) of the library on OSX to point to the lib path
                 MAC_CHARTS_LIB_NAME = "lib"$$LIBRARY_NAME".1.dylib"
                 QMAKE_POST_LINK += "install_name_tool -id $$CHART_BUILD_LIB_DIR"/"$$MAC_CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$MAC_CHARTS_LIB_NAME"
                 # Update the name (id) of the installed library on OSX to point to the installation path
                 postinstall.path = $$[QT_INSTALL_LIBS]
                 postinstall.extra = "install_name_tool -id $(INSTALL_ROOT)"/"$$[QT_INSTALL_LIBS]"/"$$MAC_CHARTS_LIB_NAME $(INSTALL_ROOT)"/"$$[QT_INSTALL_LIBS]"/"$$MAC_CHARTS_LIB_NAME"
                 INSTALLS += postinstall
             }
             ################################ DEVELOPMENT BUILD ##########################################
             # There is a problem with jom.exe currently. It does not seem to understand QMAKE_EXTRA_TARGETS properly.
             # This is the case at least with shadow builds.
             # http://qt-project.org/wiki/jom
             development_build:!win32-msvc*:{
                 chartversion.target = $$PWD/qchartversion_p.h
                 unix:{
                     chartversion.commands = @echo \
                         \" $${LITERAL_HASH}ifndef QCHARTVERSION_P_H\\n\
                         $${LITERAL_HASH}define QCHARTVERSION_P_H\\n\
                         const char *buildTime = \\\"`date +'%y%m%d%H%M'`\\\" ; \\n\
                         const char *gitHead = \\\"`git rev-parse HEAD`\\\" ; \\n \
                         $${LITERAL_HASH}endif \"  \
                         > \
                         $$chartversion.target;
                 }else{
                     chartversion.commands = @echo \
                         "const char *buildTime = \"%date%_%time%\" ; \
                          const char *gitHead = \"unknown\" ; " \
                         > \
                         $$chartversion.target
                 }
                 chartversion.depends = $$HEADERS \
                     $$SOURCES
                 PRE_TARGETDEPS += $$chartversion.target
                 QMAKE_CLEAN += $$PWD/qchartversion_p.h
                 QMAKE_EXTRA_TARGETS += chartversion
             }
             ############################### CLEAN ###########################################
             unix:QMAKE_DISTCLEAN += -r \
                 $$CHART_BUILD_HEADER_DIR \
                 $$CHART_BUILD_LIB_DIR
             win32:QMAKE_DISTCLEAN += /Q \
                 $$CHART_BUILD_HEADER_DIR \
                 $$CHART_BUILD_LIB_DIR
             ############################## COVERAGE #########################################
             unix:coverage:{
             QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
             QMAKE_LDFLAGS += -fprofile-arcs -ftest-coverage
             LIBS += -lgcov
             QMAKE_CLEAN += $$OBJECTS_DIR/*.gcda $$OBJECTS_DIR/*.gcno $$PWD/*.gcov ../coverage/*.info
             QMAKE_EXTRA_TARGETS += preparecoverage gencoverage
             preparecoverage.target = prepare_coverage
             preparecoverage.depends = all
             preparecoverage.commands =  lcov --directory $$OBJECTS_DIR --zerocounters ;\
                                         lcov -i -d $$OBJECTS_DIR -c -o ../coverage/base.info -b $$PWD;
             gencoverage.target = gen_coverage
             gencoverage.depends = all
             gencoverage.commands = lcov -d $$OBJECTS_DIR -c -o ../coverage/src.info -b $$PWD;\
                                    lcov -e ../coverage/base.info $$PWD/* $$PWD/animations/* $$PWD/areachart/* $$PWD/axis/* $$PWD/barchart/* $$PWD/legend/* $$PWD/linechart/* $$PWD/piechart/* $$PWD/scatterchart/* $$PWD/splinechart/* $$PWD/themes/* $$PWD/xychart/* -o ../coverage/base.info;\
                                    lcov -e ../coverage/src.info $$PWD/* $$PWD/animations/* $$PWD/areachart/* $$PWD/axis/* $$PWD/barchart/* $$PWD/legend/* $$PWD/linechart/* $$PWD/piechart/* $$PWD/scatterchart/* $$PWD/splinechart/* $$PWD/themes/* $$PWD/xychart/* -o ../coverage/src.info;\
                                    lcov -a ../coverage/base.info -a ../coverage/src.info -o ../coverage/coverage.info;
             }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages