HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r255:ef94f64ce15a

Add qmlplugin support for integrated build

Michal Klocek -

r255:ef94f64ce15a

parent child

Context file:

r255:ef94f64ce15a

Collapse all files

test/qmlchart/qml/qmlchart/loader.qml created 644 +17 0

@@ -0,0 +1,17
	1	import QtQuick 1.0
	2
	3	Item {
	4	id: container
	5	width: 400
	6	height: 500
	7	Component.onCompleted: {
	8	var co = Qt.createComponent("main.qml")
	9	if (co.status == Component.Ready) {
	10	var o = co.createObject(container)
	11	} else {
	12	console.log(co.errorString())
	13	console.log("QtCommercial.Chart 1.1 not available")
	14	console.log("Please use correct QML_IMPORT_PATH export")
	15	}
	16	}
	17	} No newline at end of file

test/qmlchart/resources.qrc created 644 +6 0

@@ -0,0 +1,6
	1	<RCC>
	2	<qresource prefix="/">
	3	<file>qml/qmlchart/loader.qml</file>
	4	<file>qml/qmlchart/main.qml</file>
	5	</qresource>
	6	</RCC>

common.pri +2 0

             CONFIG+=integrated_build #remove if you want to build against installed libs
             CHART_BUILD_PUBLIC_HEADER_DIR = $$PWD/include
             CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private
             CHART_BUILD_LIB_DIR = $$PWD/lib
             CHART_BUILD_DIR = $$PWD/build
             CHART_BUILD_BIN_DIR = $$PWD/bin
+            CHART_BUILD_PLUGIN_DIR = $$CHART_BUILD_LIB_DIR/QtCommercial/Chart
             # hack to fix windows builds
             win32:{
                 CHART_BUILD_PUBLIC_HEADER_DIR = $$replace(CHART_BUILD_PUBLIC_HEADER_DIR, "/","\\")
                 CHART_BUILD_PRIVATE_HEADER_DIR = $$replace(CHART_BUILD_PRIVATE_HEADER_DIR, "/","\\")
                 CHART_BUILD_LIB_DIR = $$replace(CHART_BUILD_LIB_DIR, "/","\\")
                 CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\")
                 CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\")
+                CHART_BUILD_PLUGIN_DIR = $$replace(CHART_BUILD_PLUGIN_DIR, "/","\\")
             }
             mac: {
                 # TODO: The following qmake flags are a work-around to make QtCommercial Charts compile on
                 # QtCommercial 4.8. On the other hand Charts builds successfully with Qt open source 4.8
                 # without these definitions, so this is probably a configuration issue on QtCommercial 4.8;
                 # it should probably define the minimum OSX version to be 10.5...
                 QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5
                 QMAKE_LFLAGS *= -mmacosx-version-min=10.5
             }

qmlplugin/qmlplugin.pro +7 -5

             !include( ../common.pri ) {
                 error( "Couldn't find the common.pri file!" )
             }
             !include( ../integrated.pri ) {
                 error( "Couldn't find the integrated.pri file !")
             }
             TEMPLATE = lib
             TARGET = qtcommercialchartqml
+            DESTDIR = $$CHART_BUILD_PLUGIN_DIR
             CONFIG += qt plugin
             QT += declarative
             contains(QT_MAJOR_VERSION, 5) {
                 # TODO: QtQuick2 not supported by the implementation currently
                 DEFINES += QTQUICK2
             }
-            OBJECTS_DIR = $$CHART_BUILD_DIR/lib
+            OBJECTS_DIR = $$CHART_BUILD_DIR/plugin
-            MOC_DIR = $$CHART_BUILD_DIR/lib
+            MOC_DIR = $$CHART_BUILD_DIR/plugin
-            UI_DIR = $$CHART_BUILD_DIR/lib
+            UI_DIR = $$CHART_BUILD_DIR/plugin
-            RCC_DIR = $$CHART_BUILD_DIR/lib
+            RCC_DIR = $$CHART_BUILD_DIR/plugin
             SOURCES += \
                 plugin.cpp \
                 declarativechart.cpp \
                 declarativeseries.cpp \
                 declarativescatterseries.cpp \
                 scatterelement.cpp \
                 declarativepieseries.cpp \
                 declarativelineseries.cpp
             HEADERS += \
                 declarativechart.h \
                 declarativeseries.h \
                 declarativescatterseries.h \
                 scatterelement.h \
                 declarativepieseries.h \
                 declarativelineseries.h
+            QMAKE_POST_LINK = $$QMAKE_COPY qmldir $$CHART_BUILD_PLUGIN_DIR
             TARGETPATH = QtCommercial/Chart
             target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
             qmldir.files += $$PWD/qmldir
             qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
             INSTALLS += target qmldir

test/qmlchart/main.cpp +1 -1

             #include <QtGui/QApplication>
             #include <QDeclarativeEngine>
             #include "qmlapplicationviewer.h"
             Q_DECL_EXPORT int main(int argc, char *argv[])
             {
                 QScopedPointer<QApplication> app(createApplication(argc, argv));
                 QScopedPointer<QmlApplicationViewer> viewer(QmlApplicationViewer::create());
                 viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
-                viewer->setMainQmlFile(QLatin1String("qml/qmlchart/main.qml"));
+                viewer->setSource(QUrl("qrc:/qml/qmlchart/loader.qml"));
                 viewer->showExpanded();
                 return app->exec();
             }

test/qmlchart/qml/qmlchart/main.qml +2 -2

             import QtQuick 1.0
             import QtCommercial.Chart 1.0
             Rectangle {
-                width: 360
+                width: parent.width
-                height: 360
+                height: parent.height
                 // Another option for QML data api:
             //    ListModel {
             //        id: listModelForPie
             //        // PieDataElement
             //        ListElement {
             //            label: "Apple"
             //            value: 4.3
             //        }
             //        ListElement {
             //            label: "Blackberry"
             //            value: 15.1
             //        }
             //    }
                 Component.onCompleted: {
             //        console.log("Component.onCompleted: " + ChartPointElement.x);
             //        console.log("Component.onCompleted: " + ChartPointElement.y);
             //        console.log("Component.onCompleted: " + ChartPointElement.dataX);
             //        console.log("Component.onCompleted: " + ChartPointElement.dataY);
                     //console.log("Component.onCompleted: " + chartModel.get(0).x);
                     //console.log("Component.onCompleted: " + chartModel.ChartPointElements);
             //        console.log("Component.onCompleted: " + elementt.dataX);
             //        console.log("Component.onCompleted: " + chartModel.get(0).dataX);
                     //ChartPointElement { x: 0.3; y: 0.3 }
                 }
                 Chart {
                     id: chart1
                     anchors.top: parent.top
                     anchors.left: parent.left
                     anchors.right: parent.right
                     height: parent.height / 2
                     theme: Chart.ThemeVanilla
                     PieSeries {
                         data: [
                             // TODO: "NnElement" matches the naming convention of for example ListModel...
                             // But PieSlice would match the naming of QtCommercial Charts C++ api
                             ChartPieElement { label: "Volkswagen"; value: 13.5 },
                             ChartPieElement { label: "Toyota"; value: 10.9 },
                             ChartPieElement { label: "Ford"; value: 8.6 },
                             ChartPieElement { label: "Skoda"; value: 8.2 },
                             ChartPieElement { label: "Volvo"; value: 6.8 },
                             ChartPieElement { label: "Others"; value: 52.0 }
                         ]
                     }
             //        Series {
             //            seriesType: Series.SeriesTypeLine
             //        }
                     // TODO:
             //        Series {
             //            seriesType: Series.SeriesTypeBar
             //        }
                 }
                 Chart {
                     id: chart2
                     anchors.top: chart1.bottom
                     anchors.bottom: parent.bottom
                     anchors.left: parent.left
                     anchors.right: parent.right
                     theme: Chart.ThemeScientific
                     LineSeries {
                         data: [
                             ChartPointElement { x: 0.0; y: 0.0 },
                             ChartPointElement { x: 1.1; y: 2.1 },
                             ChartPointElement { x: 2.9; y: 4.9 },
                             ChartPointElement { x: 3.2; y: 3.0 }
                         ]
                     }
                     ScatterSeries {
                         data: [
                             ChartPointElement { x: 1.1; y: 1.1 },
                             ChartPointElement { x: 1.1; y: 1.2 },
                             ChartPointElement { x: 1.17; y: 1.15 }
                         ]
                     }
                     ScatterSeries {
                         data: [
                             ChartPointElement { x: 1.5; y: 1.5 },
                             ChartPointElement { x: 1.5; y: 1.6 },
                             ChartPointElement { x: 1.57; y: 1.55 }
                         ]
                     }
                     ScatterSeries {
                         data: [
                             ChartPointElement { x: 2.0; y: 2.0 },
                             ChartPointElement { x: 2.0; y: 2.1 },
                             ChartPointElement { x: 2.07; y: 2.05 }
                         ]
                     }
                     ScatterSeries {
                         id: scatter4
                         data: [
                             ChartPointElement { x: 2.6; y: 2.6 },
                             ChartPointElement { x: 2.6; y: 2.7 },
                             ChartPointElement { x: 2.67; y: 2.65 }
                         ]
                     }
                 }
             }

test/qmlchart/qmlchart.pro +12 -9

             !include( ../../common.pri ) {
                 error( "Couldn't find the common.pri file!" )
             }
-            !include( ../../integrated.pri ) {
-                error( "Couldn't find the integrated.pri file !")
-            integrated_build: {
+            DESTDIR = $$CHART_BUILD_BIN_DIR
-                # cannot use integrated build for now; we would need the qml files copied to
-                # charts/bin folder also to make this work. And even in that case I'm not sure if
+            OBJECTS_DIR = $$CHART_BUILD_DIR/bin/$$TARGET
-                # the chart qml plugin can be found or if it needs to be installed to the qt's plugin
+            MOC_DIR = $$CHART_BUILD_DIR/bin/$$TARGET
-                # folder always.
+            UI_DIR = $$CHART_BUILD_DIR/bin/$$TARGET
-                warning("TODO: Charts qml test app does not work with integrated builds")
+            RCC_DIR = $$CHART_BUILD_DIR/bin/$$TARGET
+            integrated_build:{
+                message(Please export QML_IMPORT_PATH=$$CHART_BUILD_LIB_DIR)
             }
+            RESOURCES += \
+                resources.qrc
             # Add more folders to ship with the application, here
             folder_01.source = qml/qmlchart
             folder_01.target = qml
             DEPLOYMENTFOLDERS = folder_01
             # Additional import path used to resolve QML modules in Creator's code model
             QML_IMPORT_PATH =
             symbian:TARGET.UID3 = 0xE421236E
             # Smart Installer package's UID
             # This UID is from the protected range and therefore the package will
             # fail to install if self-signed. By default qmake uses the unprotected
             # range value if unprotected UID is defined for the application and
             # 0x2002CCCF value if protected UID is given to the application
             #symbian:DEPLOYMENT.installer_header = 0x2002CCCF
             # Allow network access on Symbian
             symbian:TARGET.CAPABILITY += NetworkServices
             # If your application uses the Qt Mobility libraries, uncomment the following
             # lines and add the respective components to the MOBILITY variable.
             # CONFIG += mobility
             # MOBILITY +=
             # Speed up launching on MeeGo/Harmattan when using applauncherd daemon
             # CONFIG += qdeclarative-boostable
             # Add dependency to Symbian components
             # CONFIG += qt-components
             # The .cpp file which was generated for your project. Feel free to hack it.
             SOURCES += main.cpp
             # Please do not modify the following two lines. Required for deployment.
             include(qmlapplicationviewer/qmlapplicationviewer.pri)
             qtcAddDeployment()
             #HEADERS += \
             #    chart.h

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