@@ -1,114 +1,102 | |||||
1 |
|
1 | |||
2 | LIBRARY_NAME = QtCommercialChart |
|
2 | LIBRARY_NAME = QtCommercialChart | |
3 |
|
3 | |||
4 | ##################### SHADOW CONFIG ################################################# |
|
4 | ##################### SHADOW CONFIG ################################################# | |
5 |
|
5 | |||
6 | !contains($${PWD}, $${OUT_PWD}){ |
|
6 | !contains($${PWD}, $${OUT_PWD}){ | |
7 | search = "$$PWD:::" |
|
7 | search = "$$PWD:::" | |
8 | temp = $$split(search,"/") |
|
8 | temp = $$split(search,"/") | |
9 | temp = $$last(temp) |
|
9 | temp = $$last(temp) | |
10 | path = $$replace(search,$$temp,'') |
|
10 | path = $$replace(search,$$temp,'') | |
11 | temp = $$split(OUT_PWD,$$path) |
|
11 | temp = $$split(OUT_PWD,$$path) | |
12 | temp = $$split(temp,'/') |
|
12 | temp = $$split(temp,'/') | |
13 | temp = $$first(temp) |
|
13 | temp = $$first(temp) | |
14 | path = "$${path}$${temp}" |
|
14 | path = "$${path}$${temp}" | |
15 | SHADOW=$$path |
|
15 | SHADOW=$$path | |
16 | }else{ |
|
16 | }else{ | |
17 | SHADOW=$$PWD |
|
17 | SHADOW=$$PWD | |
18 | CONFIG-=development_build |
|
18 | CONFIG-=development_build | |
19 | } |
|
19 | } | |
20 |
|
20 | |||
21 | ##################### BUILD PATHS ################################################## |
|
21 | ##################### BUILD PATHS ################################################## | |
22 |
|
22 | |||
23 | CHART_BUILD_PUBLIC_HEADER_DIR = $$SHADOW/include |
|
23 | CHART_BUILD_PUBLIC_HEADER_DIR = $$SHADOW/include | |
24 | CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private |
|
24 | CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private | |
25 | CHART_BUILD_LIB_DIR = $$SHADOW/lib |
|
25 | CHART_BUILD_LIB_DIR = $$SHADOW/lib | |
26 | CHART_BUILD_DIR = $$SHADOW/build |
|
26 | CHART_BUILD_DIR = $$SHADOW/build | |
27 | CHART_BUILD_BIN_DIR = $$SHADOW/bin |
|
27 | CHART_BUILD_BIN_DIR = $$SHADOW/bin | |
28 | CHART_BUILD_PLUGIN_DIR = $$CHART_BUILD_BIN_DIR/QtCommercial/Chart |
|
28 | CHART_BUILD_PLUGIN_DIR = $$CHART_BUILD_BIN_DIR/QtCommercial/Chart | |
29 | CHART_BUILD_DOC_DIR = $$SHADOW/doc |
|
29 | CHART_BUILD_DOC_DIR = $$SHADOW/doc | |
30 |
|
30 | |||
31 | win32:{ |
|
31 | win32:{ | |
32 | CHART_BUILD_PUBLIC_HEADER_DIR = $$replace(CHART_BUILD_PUBLIC_HEADER_DIR, "/","\\") |
|
32 | CHART_BUILD_PUBLIC_HEADER_DIR = $$replace(CHART_BUILD_PUBLIC_HEADER_DIR, "/","\\") | |
33 | CHART_BUILD_PRIVATE_HEADER_DIR = $$replace(CHART_BUILD_PRIVATE_HEADER_DIR, "/","\\") |
|
33 | CHART_BUILD_PRIVATE_HEADER_DIR = $$replace(CHART_BUILD_PRIVATE_HEADER_DIR, "/","\\") | |
34 | CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\") |
|
34 | CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\") | |
35 | CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\") |
|
35 | CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\") | |
36 | CHART_BUILD_PLUGIN_DIR = $$replace(CHART_BUILD_PLUGIN_DIR, "/","\\") |
|
36 | CHART_BUILD_PLUGIN_DIR = $$replace(CHART_BUILD_PLUGIN_DIR, "/","\\") | |
37 | CHART_BUILD_DOC_DIR = $$replace(CHART_BUILD_DOC_DIR, "/","\\") |
|
37 | CHART_BUILD_DOC_DIR = $$replace(CHART_BUILD_DOC_DIR, "/","\\") | |
38 | CHART_BUILD_LIB_DIR = $$CHART_BUILD_BIN_DIR |
|
38 | CHART_BUILD_LIB_DIR = $$CHART_BUILD_BIN_DIR | |
39 | } |
|
39 | } | |
40 |
|
40 | |||
41 | mac: { |
|
41 | mac: { | |
42 | # TODO: The following qmake flags are a work-around to make QtCommercial Charts compile on |
|
42 | # TODO: The following qmake flags are a work-around to make QtCommercial Charts compile on | |
43 | # QtCommercial 4.8. On the other hand Charts builds successfully with Qt open source 4.8 |
|
43 | # QtCommercial 4.8. On the other hand Charts builds successfully with Qt open source 4.8 | |
44 | # without these definitions, so this is probably a configuration issue on QtCommercial 4.8; |
|
44 | # without these definitions, so this is probably a configuration issue on QtCommercial 4.8; | |
45 | # it should probably define the minimum OSX version to be 10.5... |
|
45 | # it should probably define the minimum OSX version to be 10.5... | |
46 | QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5 |
|
46 | QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5 | |
47 | QMAKE_LFLAGS *= -mmacosx-version-min=10.5 |
|
47 | QMAKE_LFLAGS *= -mmacosx-version-min=10.5 | |
48 |
|
48 | |||
49 | CHART_BUILD_LIB_DIR = $$CHART_BUILD_BIN_DIR |
|
49 | CHART_BUILD_LIB_DIR = $$CHART_BUILD_BIN_DIR | |
50 | } |
|
50 | } | |
51 |
|
51 | |||
52 | ##################### DEVELOPMENT BUILD ################################################### |
|
52 | ##################### DEVELOPMENT BUILD ################################################### | |
53 |
|
53 | |||
54 | development_build: { |
|
54 | development_build: { | |
55 | DEFINES+=DEVELOPMENT_BUILD |
|
55 | DEFINES+=DEVELOPMENT_BUILD | |
56 | CONFIG+=debug_and_release |
|
56 | CONFIG+=debug_and_release | |
57 | } |
|
57 | } | |
58 |
|
58 | |||
59 |
|
59 | |||
60 | ##################### BUILD CONFIG ######################################################## |
|
60 | ##################### BUILD CONFIG ######################################################## | |
61 |
|
61 | |||
62 | !system_build:{ |
|
62 | !system_build:{ | |
63 |
|
63 | |||
64 | INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR |
|
64 | INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR | |
65 |
|
65 | |||
66 | !win32: { |
|
66 | !win32: { | |
67 | LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR |
|
67 | LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR | |
68 | }else{ |
|
68 | }else{ | |
69 | win32-msvc*: { |
|
69 | win32-msvc*: { | |
70 | # hack fix for error: |
|
70 | # hack fix for error: | |
71 | # "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'" |
|
71 | # "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'" | |
72 | QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR |
|
72 | QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR | |
73 | }else{ |
|
73 | }else{ | |
74 | LIBS += -L $$CHART_BUILD_LIB_DIR |
|
74 | LIBS += -L $$CHART_BUILD_LIB_DIR | |
75 | } |
|
75 | } | |
76 | } |
|
76 | } | |
77 |
|
77 | |||
78 | CONFIG(debug, debug|release) { |
|
78 | CONFIG(debug, debug|release) { | |
79 | mac: LIBRARY_NAME = $$join(LIBRARY_NAME,,,_debug) |
|
79 | mac: LIBRARY_NAME = $$join(LIBRARY_NAME,,,_debug) | |
80 | win32: LIBRARY_NAME = $$join(LIBRARY_NAME,,,d) |
|
80 | win32: LIBRARY_NAME = $$join(LIBRARY_NAME,,,d) | |
81 | } |
|
81 | } | |
82 |
|
82 | |||
83 | LIBS += -l$$LIBRARY_NAME |
|
83 | LIBS += -l$$LIBRARY_NAME | |
84 |
|
84 | |||
85 | mac: { |
|
85 | mac: { | |
86 | # This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX |
|
86 | # This is a hack; we define variables for easier install_name_tool calls from project files of OSX executables/libraries | |
87 | CHARTS_LIB_NAME = libQtCommercialChart.1.dylib |
|
87 | # install_name_tool is used to update the dependencies to chart library to match the local build folder | |
|
88 | MAC_CHARTS_LIB_NAME = "lib"$$LIBRARY_NAME".1.dylib" | |||
88 | CONFIG(debug, debug|release) { |
|
89 | CONFIG(debug, debug|release) { | |
89 |
CHARTS_LIB_NAME = |
|
90 | MAC_CHARTS_LIB_NAME = "lib"$$LIBRARY_NAME".1.dylib" | |
90 | } |
|
|||
91 | BIN_TARGET_PATH = "" |
|
|||
92 | exists ($$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET) { |
|
|||
93 | BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET |
|
|||
94 | } |
|
|||
95 | exists ($$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET) { |
|
|||
96 | # Executable in test folder |
|
|||
97 | BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET |
|
|||
98 | } |
|
|||
99 | exists ($$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET) { |
|
|||
100 | # Executable in test folder with custom target "tst_NNN" |
|
|||
101 | BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET |
|
|||
102 | } |
|
|||
103 | exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") { |
|
|||
104 | # Plugin |
|
|||
105 | BIN_TARGET_PATH = $$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib" |
|
|||
106 | } |
|
|||
107 | !isEmpty (BIN_TARGET_PATH) { |
|
|||
108 | QMAKE_POST_LINK += install_name_tool -change $$CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$CHARTS_LIB_NAME $$BIN_TARGET_PATH |
|
|||
109 | } |
|
91 | } | |
|
92 | MAC_POST_LINK_PREFIX = install_name_tool -change $$MAC_CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$MAC_CHARTS_LIB_NAME | |||
|
93 | MAC_DEMOS_BIN_DIR = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET | |||
|
94 | MAC_EXAMPLES_BIN_DIR = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET | |||
|
95 | MAC_TESTS_BIN_DIR = $$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET | |||
|
96 | MAC_AUTOTESTS_BIN_DIR = $$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET | |||
|
97 | MAC_PLUGINS_BIN_DIR = $$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib" | |||
110 | } |
|
98 | } | |
111 |
|
99 | |||
112 | } else { |
|
100 | } else { | |
113 | CONFIG += qtcommercialchart |
|
101 | CONFIG += qtcommercialchart | |
114 | } |
|
102 | } |
@@ -1,4 +1,12 | |||||
1 | !include( ../demos.pri ):error( "Couldn't find the demos.pri file!" ) |
|
1 | !include( ../demos.pri ):error( "Couldn't find the demos.pri file!" ) | |
2 | TARGET = chartthemes |
|
2 | TARGET = chartthemes | |
3 | SOURCES = main.cpp themewidget.cpp |
|
3 | SOURCES = main.cpp themewidget.cpp | |
4 | HEADERS = themewidget.h |
|
4 | HEADERS = themewidget.h | |
|
5 | ||||
|
6 | # This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX | |||
|
7 | #CHARTS_LIB_NAME = "lib"$$LIBRARY_NAME".1.dylib" | |||
|
8 | #CONFIG(debug, debug|release) { | |||
|
9 | # CHARTS_LIB_NAME = "lib"$$LIBRARY_NAME".1.dylib" | |||
|
10 | #} | |||
|
11 | ||||
|
12 | mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_DEMOS_BIN_DIR" |
@@ -1,9 +1,10 | |||||
|
1 | CURRENTLY_BUILDING_COMPONENTS = "demos" | |||
1 | !include( ../config.pri ) { |
|
2 | !include( ../config.pri ) { | |
2 | error( "Couldn't find the config.pri file!" ) |
|
3 | error( "Couldn't find the config.pri file!" ) | |
3 | } |
|
4 | } | |
4 |
|
5 | |||
5 | TEMPLATE = subdirs |
|
6 | TEMPLATE = subdirs | |
6 | SUBDIRS += chartthemes \ |
|
7 | SUBDIRS += chartthemes \ | |
7 | piechartcustomization \ |
|
8 | piechartcustomization \ | |
8 | qmlchart \ |
|
9 | qmlchart \ | |
9 | dynamicspline |
|
10 | dynamicspline |
@@ -1,4 +1,6 | |||||
1 | !include( ../demos.pri ):error( "Couldn't find the demos.pri file!" ) |
|
1 | !include( ../demos.pri ):error( "Couldn't find the demos.pri file!" ) | |
2 | TARGET = dynamicspline |
|
2 | TARGET = dynamicspline | |
3 | HEADERS += chart.h |
|
3 | HEADERS += chart.h | |
4 | SOURCES += main.cpp chart.cpp |
|
4 | SOURCES += main.cpp chart.cpp | |
|
5 | ||||
|
6 | mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_DEMOS_BIN_DIR" |
@@ -1,17 +1,18 | |||||
1 | !include( ../demos.pri ) { |
|
1 | !include( ../demos.pri ) { | |
2 | error( "Couldn't find the demos.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 | mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_DEMOS_BIN_DIR" | |||
17 |
|
18 |
@@ -1,9 +1,10 | |||||
1 | !include( ../demos.pri ) { |
|
1 | !include( ../demos.pri ) { | |
2 | error( "Couldn't find the demos.pri file!" ) |
|
2 | error( "Couldn't find the demos.pri file!" ) | |
3 | } |
|
3 | } | |
4 |
|
4 | |||
5 | RESOURCES += resources.qrc |
|
5 | RESOURCES += resources.qrc | |
6 | SOURCES += main.cpp |
|
6 | SOURCES += main.cpp | |
7 |
|
7 | |||
8 | include(qmlapplicationviewer/qmlapplicationviewer.pri) |
|
8 | include(qmlapplicationviewer/qmlapplicationviewer.pri) | |
9 |
|
9 | |||
|
10 | mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_DEMOS_BIN_DIR" |
@@ -1,8 +1,7 | |||||
1 | !include( ../examples.pri ) { |
|
1 | !include( ../examples.pri ) { | |
2 | error( "Couldn't find the examples.pri file!" ) |
|
2 | error( "Couldn't find the examples.pri file!" ) | |
3 | } |
|
3 | } | |
4 | TARGET = areachart |
|
4 | TARGET = areachart | |
5 | SOURCES += main.cpp |
|
5 | SOURCES += main.cpp | |
6 |
|
6 | |||
7 |
|
7 | mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" | ||
8 |
|
@@ -1,7 +1,8 | |||||
1 | !include( ../examples.pri ) { |
|
1 | !include( ../examples.pri ) { | |
2 | error( "Couldn't find the examples.pri file!" ) |
|
2 | error( "Couldn't find the examples.pri file!" ) | |
3 | } |
|
3 | } | |
4 |
|
4 | |||
5 | TARGET = barchart |
|
5 | TARGET = barchart | |
6 | SOURCES += main.cpp |
|
6 | SOURCES += main.cpp | |
7 |
|
7 | |||
|
8 | mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" |
@@ -1,9 +1,8 | |||||
1 | !include( ../examples.pri ) { |
|
1 | !include( ../examples.pri ) { | |
2 | error( "Couldn't find the examples.pri file!" ) |
|
2 | error( "Couldn't find the examples.pri file!" ) | |
3 | } |
|
3 | } | |
4 |
|
4 | |||
5 | TARGET = customchart |
|
5 | TARGET = customchart | |
6 | SOURCES += main.cpp |
|
6 | SOURCES += main.cpp | |
7 |
|
7 | |||
8 |
|
8 | mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" | ||
9 |
|
@@ -1,29 +1,22 | |||||
|
1 | CURRENTLY_BUILDING_COMPONENTS = "examples" | |||
1 | !include( ../config.pri ) { |
|
2 | !include( ../config.pri ) { | |
2 | error( "Couldn't find the config.pri file!" ) |
|
3 | error( "Couldn't find the config.pri file!" ) | |
3 | } |
|
4 | } | |
4 |
|
5 | |||
5 | TEMPLATE = subdirs |
|
6 | TEMPLATE = subdirs | |
6 | SUBDIRS += \ |
|
7 | SUBDIRS += \ | |
7 | areachart \ |
|
8 | areachart \ | |
8 | barchart \ |
|
9 | barchart \ | |
9 | customchart \ |
|
10 | customchart \ | |
10 | linechart \ |
|
11 | linechart \ | |
11 | percentbarchart \ |
|
12 | percentbarchart \ | |
12 | piechart \ |
|
13 | piechart \ | |
13 | piechartdrilldown \ |
|
14 | piechartdrilldown \ | |
14 | presenterchart \ |
|
15 | presenterchart \ | |
15 | scatterchart \ |
|
16 | scatterchart \ | |
16 | scatterinteractions \ |
|
17 | scatterinteractions \ | |
17 | splinechart \ |
|
18 | splinechart \ | |
18 | stackedbarchart \ |
|
19 | stackedbarchart \ | |
19 | stackedbarchartdrilldown \ |
|
20 | stackedbarchartdrilldown \ | |
20 | zoomlinechart \ |
|
21 | zoomlinechart \ | |
21 | modeldata |
|
22 | modeldata | |
22 |
|
||||
23 |
|
||||
24 |
|
||||
25 |
|
||||
26 |
|
||||
27 |
|
||||
28 |
|
||||
29 |
|
@@ -1,8 +1,7 | |||||
1 | !include( ../examples.pri ) { |
|
1 | !include( ../examples.pri ) { | |
2 | error( "Couldn't find the examples.pri file!" ) |
|
2 | error( "Couldn't find the examples.pri file!" ) | |
3 | } |
|
3 | } | |
4 | TARGET = linechart |
|
4 | TARGET = linechart | |
5 | SOURCES += main.cpp |
|
5 | SOURCES += main.cpp | |
6 |
|
6 | |||
7 |
|
7 | mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" | ||
8 |
|
@@ -1,22 +1,18 | |||||
1 | #------------------------------------------------- |
|
|||
2 | # |
|
|||
3 | # Project created by QtCreator 2012-03-08T14:30:24 |
|
|||
4 | # |
|
|||
5 | #------------------------------------------------- |
|
|||
6 |
|
||||
7 |
|
|
1 | !include( ../examples.pri ) { | |
8 | error( "Couldn't find the examples.pri file!" ) |
|
2 | error( "Couldn't find the examples.pri file!" ) | |
9 | } |
|
3 | } | |
10 |
|
4 | |||
11 | QT += core gui |
|
5 | QT += core gui | |
12 |
|
6 | |||
13 | TARGET = modeldata |
|
7 | TARGET = modeldata | |
14 | TEMPLATE = app |
|
8 | TEMPLATE = app | |
15 |
|
9 | |||
16 |
|
10 | |||
17 | SOURCES += main.cpp\ |
|
11 | SOURCES += main.cpp\ | |
18 | tablewidget.cpp \ |
|
12 | tablewidget.cpp \ | |
19 | customtablemodel.cpp |
|
13 | customtablemodel.cpp | |
20 |
|
14 | |||
21 | HEADERS += tablewidget.h \ |
|
15 | HEADERS += tablewidget.h \ | |
22 | customtablemodel.h |
|
16 | customtablemodel.h | |
|
17 | ||||
|
18 | mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" |
@@ -1,7 +1,8 | |||||
1 | !include( ../examples.pri ) { |
|
1 | !include( ../examples.pri ) { | |
2 | error( "Couldn't find the examples.pri file!" ) |
|
2 | error( "Couldn't find the examples.pri file!" ) | |
3 | } |
|
3 | } | |
4 |
|
4 | |||
5 | TARGET = percentbarchart |
|
5 | TARGET = percentbarchart | |
6 | SOURCES += main.cpp |
|
6 | SOURCES += main.cpp | |
7 |
|
7 | |||
|
8 | mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" |
@@ -1,7 +1,7 | |||||
1 | !include( ../examples.pri ) { |
|
1 | !include( ../examples.pri ) { | |
2 | error( "Couldn't find the examples.pri file!" ) |
|
2 | error( "Couldn't find the examples.pri file!" ) | |
3 | } |
|
3 | } | |
4 | TARGET = piechart |
|
4 | TARGET = piechart | |
5 | SOURCES += main.cpp |
|
5 | SOURCES += main.cpp | |
6 |
|
6 | |||
7 |
|
7 | mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" |
@@ -1,12 +1,13 | |||||
1 | !include( ../examples.pri ) { |
|
1 | !include( ../examples.pri ) { | |
2 | error( "Couldn't find the examples.pri file!" ) |
|
2 | error( "Couldn't find the examples.pri file!" ) | |
3 | } |
|
3 | } | |
4 | TARGET = piechartdrilldown |
|
4 | TARGET = piechartdrilldown | |
5 | SOURCES += main.cpp \ |
|
5 | SOURCES += main.cpp \ | |
6 | drilldownslice.cpp \ |
|
6 | drilldownslice.cpp \ | |
7 | drilldownchart.cpp |
|
7 | drilldownchart.cpp | |
8 |
|
8 | |||
9 | HEADERS += \ |
|
9 | HEADERS += \ | |
10 | drilldownchart.h \ |
|
10 | drilldownchart.h \ | |
11 | drilldownslice.h |
|
11 | drilldownslice.h | |
12 |
|
12 | |||
|
13 | mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" |
@@ -1,6 +1,8 | |||||
1 | !include( ../examples.pri ) { |
|
1 | !include( ../examples.pri ) { | |
2 | error( "Couldn't find the examples.pri file!" ) |
|
2 | error( "Couldn't find the examples.pri file!" ) | |
3 | } |
|
3 | } | |
4 | TARGET = presenterchart |
|
4 | TARGET = presenterchart | |
5 | HEADERS += chartview.h |
|
5 | HEADERS += chartview.h | |
6 | SOURCES += main.cpp chartview.cpp No newline at end of file |
|
6 | SOURCES += main.cpp chartview.cpp | |
|
7 | ||||
|
8 | mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" |
@@ -1,9 +1,11 | |||||
1 | !include( ../examples.pri ) { |
|
1 | !include( ../examples.pri ) { | |
2 | error( "Couldn't find the examples.pri file!" ) |
|
2 | error( "Couldn't find the examples.pri file!" ) | |
3 | } |
|
3 | } | |
4 | TARGET = scatterchart |
|
4 | TARGET = scatterchart | |
5 | SOURCES += main.cpp \ |
|
5 | SOURCES += main.cpp \ | |
6 | chartview.cpp |
|
6 | chartview.cpp | |
7 |
|
7 | |||
8 | HEADERS += \ |
|
8 | HEADERS += \ | |
9 | chartview.h |
|
9 | chartview.h | |
|
10 | ||||
|
11 | mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" |
@@ -1,9 +1,11 | |||||
1 | !include( ../examples.pri ) { |
|
1 | !include( ../examples.pri ) { | |
2 | error( "Couldn't find the examples.pri file!" ) |
|
2 | error( "Couldn't find the examples.pri file!" ) | |
3 | } |
|
3 | } | |
4 |
|
4 | |||
5 | TARGET = scatterinteractions |
|
5 | TARGET = scatterinteractions | |
6 | SOURCES += main.cpp \ |
|
6 | SOURCES += main.cpp \ | |
7 | chartview.cpp |
|
7 | chartview.cpp | |
8 | HEADERS += \ |
|
8 | HEADERS += \ | |
9 | chartview.h |
|
9 | chartview.h | |
|
10 | ||||
|
11 | mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" |
@@ -1,8 +1,7 | |||||
1 | !include( ../examples.pri ) { |
|
1 | !include( ../examples.pri ) { | |
2 | error( "Couldn't find the examples.pri file!" ) |
|
2 | error( "Couldn't find the examples.pri file!" ) | |
3 | } |
|
3 | } | |
4 | TARGET = splinechart |
|
4 | TARGET = splinechart | |
5 | SOURCES += main.cpp |
|
5 | SOURCES += main.cpp | |
6 |
|
6 | |||
7 |
|
7 | mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" | ||
8 |
|
@@ -1,5 +1,7 | |||||
1 | !include( ../examples.pri ) { |
|
1 | !include( ../examples.pri ) { | |
2 | error( "Couldn't find the examples.pri file!" ) |
|
2 | error( "Couldn't find the examples.pri file!" ) | |
3 | } |
|
3 | } | |
4 | TARGET = stackedbarchart |
|
4 | TARGET = stackedbarchart | |
5 |
SOURCES += main.cpp |
|
5 | SOURCES += main.cpp | |
|
6 | ||||
|
7 | mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" |
@@ -1,7 +1,8 | |||||
1 | !include( ../examples.pri ) { |
|
1 | !include( ../examples.pri ) { | |
2 | error( "Couldn't find the examples.pri file!" ) |
|
2 | error( "Couldn't find the examples.pri file!" ) | |
3 | } |
|
3 | } | |
4 | TARGET = stackedbarchartdrilldown |
|
4 | TARGET = stackedbarchartdrilldown | |
5 | SOURCES += main.cpp drilldownseries.cpp drilldownchart.cpp |
|
5 | SOURCES += main.cpp drilldownseries.cpp drilldownchart.cpp | |
6 | HEADERS += drilldownseries.h drilldownchart.h |
|
6 | HEADERS += drilldownseries.h drilldownchart.h | |
7 |
|
7 | |||
|
8 | mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" |
@@ -1,10 +1,8 | |||||
1 | !include( ../examples.pri ) { |
|
1 | !include( ../examples.pri ) { | |
2 | error( "Couldn't find the examples.pri file!" ) |
|
2 | error( "Couldn't find the examples.pri file!" ) | |
3 | } |
|
3 | } | |
4 | TARGET = zoomlinechart |
|
4 | TARGET = zoomlinechart | |
5 | HEADERS += chartview.h |
|
5 | HEADERS += chartview.h | |
6 | SOURCES += main.cpp chartview.cpp |
|
6 | SOURCES += main.cpp chartview.cpp | |
7 |
|
7 | |||
8 |
|
8 | mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" | ||
9 |
|
||||
10 |
|
@@ -1,51 +1,53 | |||||
|
1 | CURRENTLY_BUILDING_COMPONENTS = "qmlplugin" | |||
1 | TEMPLATE = lib |
|
2 | TEMPLATE = lib | |
2 | TARGET = qtcommercialchartqml |
|
3 | TARGET = qtcommercialchartqml | |
3 | CONFIG += qt plugin |
|
4 | CONFIG += qt plugin | |
4 | QT += declarative |
|
5 | QT += declarative | |
5 |
|
6 | |||
6 | !include( ../config.pri ) { |
|
7 | !include( ../config.pri ) { | |
7 | error( "Couldn't find the config.pri file!" ) |
|
8 | error( "Couldn't find the config.pri file!" ) | |
8 | } |
|
9 | } | |
9 |
|
10 | |||
10 | DESTDIR = $$CHART_BUILD_PLUGIN_DIR |
|
11 | DESTDIR = $$CHART_BUILD_PLUGIN_DIR | |
11 | contains(QT_MAJOR_VERSION, 5) { |
|
12 | contains(QT_MAJOR_VERSION, 5) { | |
12 | # TODO: QtQuick2 not supported by the implementation currently |
|
13 | # TODO: QtQuick2 not supported by the implementation currently | |
13 | DEFINES += QTQUICK2 |
|
14 | DEFINES += QTQUICK2 | |
14 | } |
|
15 | } | |
15 |
|
16 | |||
16 | OBJECTS_DIR = $$CHART_BUILD_DIR/plugin |
|
17 | OBJECTS_DIR = $$CHART_BUILD_DIR/plugin | |
17 | MOC_DIR = $$CHART_BUILD_DIR/plugin |
|
18 | MOC_DIR = $$CHART_BUILD_DIR/plugin | |
18 | UI_DIR = $$CHART_BUILD_DIR/plugin |
|
19 | UI_DIR = $$CHART_BUILD_DIR/plugin | |
19 | RCC_DIR = $$CHART_BUILD_DIR/plugin |
|
20 | RCC_DIR = $$CHART_BUILD_DIR/plugin | |
20 |
|
21 | |||
21 | SOURCES += \ |
|
22 | SOURCES += \ | |
22 | plugin.cpp \ |
|
23 | plugin.cpp \ | |
23 | declarativechart.cpp \ |
|
24 | declarativechart.cpp \ | |
24 | declarativexyseries.cpp \ |
|
25 | declarativexyseries.cpp \ | |
25 | declarativexypoint.cpp \ |
|
26 | declarativexypoint.cpp \ | |
26 | declarativelineseries.cpp \ |
|
27 | declarativelineseries.cpp \ | |
27 | declarativesplineseries.cpp \ |
|
28 | declarativesplineseries.cpp \ | |
28 | declarativeareaseries.cpp \ |
|
29 | declarativeareaseries.cpp \ | |
29 | declarativescatterseries.cpp \ |
|
30 | declarativescatterseries.cpp \ | |
30 | declarativepieseries.cpp \ |
|
31 | declarativepieseries.cpp \ | |
31 | declarativebarseries.cpp |
|
32 | declarativebarseries.cpp | |
32 | HEADERS += \ |
|
33 | HEADERS += \ | |
33 | declarativechart.h \ |
|
34 | declarativechart.h \ | |
34 | declarativexyseries.h \ |
|
35 | declarativexyseries.h \ | |
35 | declarativexypoint.h \ |
|
36 | declarativexypoint.h \ | |
36 | declarativelineseries.h \ |
|
37 | declarativelineseries.h \ | |
37 | declarativesplineseries.h \ |
|
38 | declarativesplineseries.h \ | |
38 | declarativeareaseries.h \ |
|
39 | declarativeareaseries.h \ | |
39 | declarativescatterseries.h \ |
|
40 | declarativescatterseries.h \ | |
40 | declarativepieseries.h \ |
|
41 | declarativepieseries.h \ | |
41 | declarativebarseries.h |
|
42 | declarativebarseries.h | |
42 |
|
43 | |||
43 | TARGETPATH = QtCommercial/Chart |
|
44 | TARGETPATH = QtCommercial/Chart | |
44 | target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH |
|
45 | target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH | |
45 | qmldir.files += $$PWD/qmldir |
|
46 | qmldir.files += $$PWD/qmldir | |
46 | qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH |
|
47 | qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH | |
47 | INSTALLS += target qmldir |
|
48 | INSTALLS += target qmldir | |
48 |
|
49 | |||
49 | FILE = $$PWD/qmldir |
|
50 | FILE = $$PWD/qmldir | |
50 | win32:{FILE = $$replace(FILE, "/","\\")} |
|
51 | win32:{FILE = $$replace(FILE, "/","\\")} | |
51 | QMAKE_POST_LINK += $$QMAKE_COPY $$FILE $$CHART_BUILD_PLUGIN_DIR |
|
52 | QMAKE_POST_LINK += $$QMAKE_COPY $$FILE $$CHART_BUILD_PLUGIN_DIR | |
|
53 | mac: QMAKE_POST_LINK += " & $$MAC_POST_LINK_PREFIX $$MAC_PLUGINS_BIN_DIR" |
@@ -1,4 +1,7 | |||||
1 | !include( ../auto.pri ) { |
|
1 | !include( ../auto.pri ) { | |
2 | error( "Couldn't find the auto.pri file!" ) |
|
2 | error( "Couldn't find the auto.pri file!" ) | |
3 | } |
|
3 | } | |
|
4 | ||||
4 | SOURCES += tst_chartdataset.cpp |
|
5 | SOURCES += tst_chartdataset.cpp | |
|
6 | ||||
|
7 | mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR" |
@@ -1,4 +1,6 | |||||
1 | !include( ../auto.pri ) { |
|
1 | !include( ../auto.pri ) { | |
2 | error( "Couldn't find the auto.pri file!" ) |
|
2 | error( "Couldn't find the auto.pri file!" ) | |
3 | } |
|
3 | } | |
4 | SOURCES += tst_domain.cpp |
|
4 | SOURCES += tst_domain.cpp | |
|
5 | ||||
|
6 | mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR" |
@@ -1,4 +1,6 | |||||
1 | !include( ../auto.pri ) { |
|
1 | !include( ../auto.pri ) { | |
2 | error( "Couldn't find the auto.pri file!" ) |
|
2 | error( "Couldn't find the auto.pri file!" ) | |
3 | } |
|
3 | } | |
4 | SOURCES += tst_qchart.cpp |
|
4 | SOURCES += tst_qchart.cpp | |
|
5 | ||||
|
6 | mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR" |
@@ -1,4 +1,6 | |||||
1 | !include( ../auto.pri ) { |
|
1 | !include( ../auto.pri ) { | |
2 | error( "Couldn't find the auto.pri file!" ) |
|
2 | error( "Couldn't find the auto.pri file!" ) | |
3 | } |
|
3 | } | |
4 | SOURCES += tst_qchartview.cpp |
|
4 | SOURCES += tst_qchartview.cpp | |
|
5 | ||||
|
6 | mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR" |
@@ -1,18 +1,20 | |||||
1 | !include( ../test.pri ) { |
|
1 | !include( ../test.pri ) { | |
2 | error( "Couldn't find the test.pri file!" ) |
|
2 | error( "Couldn't find the test.pri file!" ) | |
3 | } |
|
3 | } | |
4 |
|
4 | |||
5 | TEMPLATE = app |
|
5 | TEMPLATE = app | |
6 |
|
6 | |||
7 | QT += core gui |
|
7 | QT += core gui | |
8 | contains(QT_MAJOR_VERSION, 5) { |
|
8 | contains(QT_MAJOR_VERSION, 5) { | |
9 | QT += widgets |
|
9 | QT += widgets | |
10 | } |
|
10 | } | |
11 |
|
11 | |||
12 | SOURCES += main.cpp \ |
|
12 | SOURCES += main.cpp \ | |
13 | mainwidget.cpp \ |
|
13 | mainwidget.cpp \ | |
14 | dataseriedialog.cpp |
|
14 | dataseriedialog.cpp | |
15 |
|
15 | |||
16 | HEADERS += \ |
|
16 | HEADERS += \ | |
17 | mainwidget.h \ |
|
17 | mainwidget.h \ | |
18 | dataseriedialog.h |
|
18 | dataseriedialog.h | |
|
19 | ||||
|
20 | mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_TESTS_BIN_DIR" |
@@ -1,18 +1,20 | |||||
1 | !include( ../test.pri ) { |
|
1 | !include( ../test.pri ) { | |
2 | error( "Couldn't find the test.pri file!" ) |
|
2 | error( "Couldn't find the test.pri file!" ) | |
3 | } |
|
3 | } | |
4 |
|
4 | |||
5 | QT+= sql |
|
5 | QT+= sql | |
6 | TARGET = gdpbarchart |
|
6 | TARGET = gdpbarchart | |
7 | SOURCES += main.cpp\ |
|
7 | SOURCES += main.cpp\ | |
8 | widget.cpp |
|
8 | widget.cpp | |
9 | HEADERS += widget.h |
|
9 | HEADERS += widget.h | |
10 |
|
10 | |||
11 | !mac { |
|
11 | !mac { | |
12 | FILE = $$PWD/gdpData |
|
12 | FILE = $$PWD/gdpData | |
13 | win32:{FILE = $$replace(FILE, "/","\\")} |
|
13 | win32:{FILE = $$replace(FILE, "/","\\")} | |
14 | DESTINATION = $$CHART_BUILD_BIN_DIR/test |
|
14 | DESTINATION = $$CHART_BUILD_BIN_DIR/test | |
15 | win32:{DESTINATION = $$replace(DESTINATION, "/","\\")} |
|
15 | win32:{DESTINATION = $$replace(DESTINATION, "/","\\")} | |
16 | # TODO: QMAKE_POST_LINK does not work on mac; how to copy the data file? |
|
16 | # TODO: QMAKE_POST_LINK does not work on mac; how to copy the data file? | |
17 | QMAKE_POST_LINK += $$QMAKE_COPY $$FILE $$CHART_BUILD_BIN_DIR |
|
17 | QMAKE_POST_LINK += $$QMAKE_COPY $$FILE $$CHART_BUILD_BIN_DIR | |
18 |
|
|
18 | } | |
|
19 | ||||
|
20 | mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_TESTS_BIN_DIR" |
@@ -1,16 +1,18 | |||||
1 | !include( ../test.pri ) { |
|
1 | !include( ../test.pri ) { | |
2 | error( "Couldn't find the test.pri file!" ) |
|
2 | error( "Couldn't find the test.pri file!" ) | |
3 | } |
|
3 | } | |
4 |
|
4 | |||
5 | QT += core gui |
|
5 | QT += core gui | |
6 |
|
6 | |||
7 | TARGET = tablemodelchart |
|
7 | TARGET = tablemodelchart | |
8 | TEMPLATE = app |
|
8 | TEMPLATE = app | |
9 |
|
9 | |||
10 |
|
10 | |||
11 | SOURCES += main.cpp\ |
|
11 | SOURCES += main.cpp\ | |
12 | tablewidget.cpp \ |
|
12 | tablewidget.cpp \ | |
13 | customtablemodel.cpp |
|
13 | customtablemodel.cpp | |
14 |
|
14 | |||
15 | HEADERS += tablewidget.h \ |
|
15 | HEADERS += tablewidget.h \ | |
16 | customtablemodel.h |
|
16 | customtablemodel.h | |
|
17 | ||||
|
18 | mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_TESTS_BIN_DIR" |
@@ -1,10 +1,9 | |||||
1 | !include( ../test.pri ) { |
|
1 | !include( ../test.pri ) { | |
2 | error( "Couldn't find the examples.pri file!" ) |
|
2 | error( "Couldn't find the examples.pri file!" ) | |
3 | } |
|
3 | } | |
4 | QT+=opengl |
|
4 | QT+=opengl | |
5 | TARGET = wavechart |
|
5 | TARGET = wavechart | |
6 | SOURCES += main.cpp wavechart.cpp |
|
6 | SOURCES += main.cpp wavechart.cpp | |
7 | HEADERS += wavechart.h |
|
7 | HEADERS += wavechart.h | |
8 |
|
8 | |||
9 |
|
9 | mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_TESTS_BIN_DIR" | ||
10 |
|
General Comments 0
You need to be logged in to leave comments.
Login now