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

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

Made QmlChart demo instead of a test app
Tero Ahola -
r922:d40a04983d6a
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,33 +1,33
1 1 !include(common.pri) {
2 2 error('missing common.pri')
3 3 }
4 4
5 5 TEMPLATE = subdirs
6 SUBDIRS += src examples demos test qmlplugin
6 SUBDIRS += src qmlplugin examples demos test
7 7
8 8 integrated_build:{
9 9 message('Configured for integrated build against local libs...')
10 10 } else {
11 11 message('Running build aginst system libs...')
12 12 message('Please build example test and qmlplugin after installing library.')
13 13 }
14 14
15 15 CONFIG += ordered
16 16 QMAKE_CXXFLAGS += -g -Wall
17 17 unix:QMAKE_DISTCLEAN += -r build bin include lib doc/html
18 18 win32:QMAKE_DISTCLEAN += /Q /s build bin include lib doc\\html
19 19
20 20 # install feature file
21 21 feature.path = $$[QT_INSTALL_DATA]/mkspecs/features
22 22 feature.files = $$PWD/features/qtcommercialchart.prf
23 23 INSTALLS += feature
24 24
25 25 docs.target = docs
26 26 win32:{
27 27 docs.commands = qdoc3 $$CHART_BUILD_DOC_DIR\\qcharts.qdocconf
28 28 }else{
29 29 docs.commands = qdoc3 $$CHART_BUILD_DOC_DIR/qcharts.qdocconf
30 30 }
31 31 docs.depends = FORCE
32 32 QMAKE_EXTRA_TARGETS += docs
33 33
Show file before | Show file after | Hide comments
@@ -1,4 +1,5
1 1 TEMPLATE = subdirs
2 2 SUBDIRS += chartthemes \
3 3 piechartcustomization \
4 gdpbarchart
4 gdpbarchart \
5 qmlchart
Show file before | Show file after | Hide comments
@@ -1,17 +1,17
1 1 !include( ../demos.pri ) {
2 error( "Couldn't find the examples.pri file!" )
2 error( "Couldn't find the demos.pri file!" )
3 3 }
4 4 TARGET = piechartcustomization
5 5 SOURCES += main.cpp \
6 6 pentool.cpp \
7 7 brushtool.cpp \
8 8 customslice.cpp \
9 9 mainwidget.cpp
10 10
11 11 HEADERS += \
12 12 pentool.h \
13 13 brushtool.h \
14 14 customslice.h \
15 15 mainwidget.h
16 16
17 17
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from test/qmlchart/main.cpp to demos/qmlchart/main.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from test/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp to demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from test/qmlchart/qmlapplicationviewer/qmlapplicationviewer.h to demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from test/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri to demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri
Show file before | Show file after | Hide comments
@@ -1,52 +1,48
1 !include( ../test.pri ) {
2 error( "Couldn't find the common.pri file!" )
1 !include( ../demos.pri ) {
2 error( "Couldn't find the demos.pri file!" )
3 3 }
4 4
5 5 integrated_build:{
6 6 message(Please export QML_IMPORT_PATH=$$CHART_BUILD_LIB_DIR)
7 7 }
8 8
9 9 RESOURCES += \
10 10 resources.qrc
11 11
12 12 # Add more folders to ship with the application, here
13 13 folder_01.source = qml/qmlchart
14 14 folder_01.target = qml
15 15 DEPLOYMENTFOLDERS = folder_01
16 16
17 17 # Additional import path used to resolve QML modules in Creator's code model
18 18 QML_IMPORT_PATH =
19 19
20 20 symbian:TARGET.UID3 = 0xE421236E
21 21
22 22 # Smart Installer package's UID
23 23 # This UID is from the protected range and therefore the package will
24 24 # fail to install if self-signed. By default qmake uses the unprotected
25 25 # range value if unprotected UID is defined for the application and
26 26 # 0x2002CCCF value if protected UID is given to the application
27 27 #symbian:DEPLOYMENT.installer_header = 0x2002CCCF
28 28
29 29 # Allow network access on Symbian
30 30 symbian:TARGET.CAPABILITY += NetworkServices
31 31
32 32 # If your application uses the Qt Mobility libraries, uncomment the following
33 33 # lines and add the respective components to the MOBILITY variable.
34 34 # CONFIG += mobility
35 35 # MOBILITY +=
36 36
37 37 # Speed up launching on MeeGo/Harmattan when using applauncherd daemon
38 38 # CONFIG += qdeclarative-boostable
39 39
40 40 # Add dependency to Symbian components
41 41 # CONFIG += qt-components
42 42
43 43 # The .cpp file which was generated for your project. Feel free to hack it.
44 44 SOURCES += main.cpp
45 45
46 46 # Please do not modify the following two lines. Required for deployment.
47 47 include(qmlapplicationviewer/qmlapplicationviewer.pri)
48 48 qtcAddDeployment()
49
50 #HEADERS += \
51 # chart.h
52
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from test/qmlchart/qmlchart.svg to demos/qmlchart/qmlchart.svg
Show file before | Show file after | Hide comments
@@ -1,10 +1,9
1 1 <RCC>
2 2 <qresource prefix="/">
3 3 <file>qml/qmlchart/loader.qml</file>
4 4 <file>qml/qmlchart/main.qml</file>
5 5 <file>qml/qmlchart/View1.qml</file>
6 6 <file>qml/qmlchart/View2.qml</file>
7 7 <file>qml/qmlchart/View3.qml</file>
8 <file>qml/qmlchart/View4.qml</file>
9 8 </qresource>
10 9 </RCC>
Show file before | Show file after | Hide comments
@@ -1,75 +1,75
1 1 integrated_build:{
2 2 INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR
3 3
4 4 !win32: {
5 5 LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
6 6 }else{
7 7 win32-msvc*: {
8 8 # hack fix for error:
9 9 # "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'"
10 10 QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR
11 11 }else{
12 12 LIBS += -L $$CHART_BUILD_LIB_DIR
13 13 }
14 14 }
15 15
16 16 CONFIG(debug, debug|release) {
17 17 LIBS += -lQtCommercialChartd
18 18 #this is ugly hack to work around missing rpath, it simply copies lib
19 19 win32:{
20 20 copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll
21 21 copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChartd.dll $$CHART_BUILD_BIN_DIR
22 22 copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChartd.dll
23 23 PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll
24 24 QMAKE_EXTRA_TARGETS +=copylib
25 25 }
26 26 } else {
27 27 LIBS += -lQtCommercialChart
28 28
29 29 #this is ugly hack to work around missing rpath, it simply copies lib
30 30 win32: {
31 31 copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChart
32 32 copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChart.dll $$CHART_BUILD_BIN_DIR
33 33 copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChart.dll
34 34 PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChart
35 35 QMAKE_EXTRA_TARGETS +=copylib
36 36 }
37 37 }
38 38
39 39 mac: {
40 40 # This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX
41 41 CHARTS_LIB_NAME = libQtCommercialChart.1.dylib
42 42 CONFIG(debug, debug|release) {
43 43 CHARTS_LIB_NAME = libQtCommercialChartd.1.dylib
44 44 }
45 TARGET_PATH = ""
45 BIN_TARGET_PATH = ""
46 46 exists ($$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET) {
47 TARGET_PATH = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET
47 BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET
48 48 }
49 49 exists ($$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET) {
50 50 # Executable in test folder
51 TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET
51 BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET
52 52 }
53 53 exists ($$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET) {
54 54 # Executable in test folder with custom target "tst_NNN"
55 TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET
55 BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET
56 56 }
57 57 exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") {
58 58 # Plugin
59 TARGET_PATH = $$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib"
59 BIN_TARGET_PATH = $$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib"
60 60 }
61 !isEmpty (TARGET_PATH) {
62 QMAKE_POST_LINK += install_name_tool -change $$CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$CHARTS_LIB_NAME $$TARGET_PATH
63 #message($$QMAKE_POST_LINK)
64 }
65
61 !isEmpty (BIN_TARGET_PATH) {
62 QMAKE_POST_LINK += install_name_tool -change $$CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$CHARTS_LIB_NAME $$BIN_TARGET_PATH
63 message($$QMAKE_POST_LINK)
64 } else {
66 65 # Hack to make qml plugins available as internal build versions
67 66 exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") {
68 67 QMAKE_POST_LINK += "& $$QMAKE_COPY qmldir $$CHART_BUILD_PLUGIN_DIR"
69 #message($$QMAKE_POST_LINK)
68 message($$QMAKE_POST_LINK)
69 }
70 70 }
71 71 }
72 72
73 73 } else {
74 74 CONFIG += qtcommercialchart
75 75 }
Show file before | Show file after | Hide comments
@@ -1,9 +1,8
1 1 TEMPLATE = subdirs
2 2 SUBDIRS += \
3 3 chartwidgettest \
4 wavechart \
5 qmlchart
4 wavechart
6 5
7 6 !win32:{
8 7 SUBDIRS += auto
9 8 }
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed, binary diff hidden
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed, binary diff hidden
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now