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