@@ -1,8 +1,8 | |||||
1 | !include( ../example.pri ) { |
|
1 | !include( ../example.pri ) { | |
2 | error( "Couldn't find the example.pri file!" ) |
|
2 | error( "Couldn't find the example.pri file!" ) | |
3 | } |
|
3 | } | |
4 |
TARGET = axis |
|
4 | TARGET = axischart | |
5 | SOURCES = main.cpp |
|
5 | SOURCES = main.cpp | |
6 |
|
6 | |||
7 |
|
7 | |||
8 |
|
8 |
@@ -1,17 +1,10 | |||||
1 |
!include( ../ |
|
1 | !include( ../example.pri ) { | |
2 |
error( "Couldn't find the |
|
2 | error( "Couldn't find the example.pri file!" ) | |
3 | } |
|
|||
4 |
|
||||
5 | !include( ../../integrated.pri ) { |
|
|||
6 | error( "Couldn't find the integrated.pri file !") |
|
|||
7 | } |
|
3 | } | |
8 |
|
4 | |||
9 | TARGET = barchart |
|
5 | TARGET = barchart | |
10 | TEMPLATE = app |
|
|||
11 | QT += core gui |
|
|||
12 | SOURCES += main.cpp \ |
|
6 | SOURCES += main.cpp \ | |
13 | chartwidget.cpp |
|
7 | chartwidget.cpp | |
14 |
|
||||
15 | HEADERS += \ |
|
8 | HEADERS += \ | |
16 | chartwidget.h |
|
9 | chartwidget.h | |
17 |
|
10 |
@@ -1,15 +1,9 | |||||
1 |
!include( ../ |
|
1 | !include( ../example.pri ) { | |
2 |
error( "Couldn't find the |
|
2 | error( "Couldn't find the example.pri file!" ) | |
3 | } |
|
3 | } | |
4 |
|
4 | |||
5 | !include( ../../integrated.pri ) { |
|
5 | TARGET = colorlinechart | |
6 | error( "Couldn't find the integrated.pri file !") |
|
|||
7 | } |
|
|||
8 |
|
||||
9 | TARGET = colorlineChart |
|
|||
10 | TEMPLATE = app |
|
|||
11 | QT += core gui |
|
|||
12 | SOURCES += main.cpp |
|
6 | SOURCES += main.cpp | |
13 |
|
7 | |||
14 |
|
8 | |||
15 |
|
9 |
@@ -1,16 +1,10 | |||||
1 |
!include( ../ |
|
1 | !include( ../example.pri ) { | |
2 |
error( "Couldn't find the |
|
2 | error( "Couldn't find the example.pri file!" ) | |
3 | } |
|
3 | } | |
4 |
|
4 | QT+=opengl | ||
5 | !include( ../../integrated.pri ) { |
|
5 | TARGET = dynamiclinechart | |
6 | error( "Couldn't find the integrated.pri file !") |
|
|||
7 | } |
|
|||
8 |
|
||||
9 | TARGET = dynamicLineChart |
|
|||
10 | TEMPLATE = app |
|
|||
11 | QT += core gui opengl |
|
|||
12 | SOURCES += main.cpp |
|
6 | SOURCES += main.cpp | |
13 | HEADERS += wavegenerator.h |
|
7 | HEADERS += wavegenerator.h | |
14 |
|
8 | |||
15 |
|
9 | |||
16 |
|
10 |
@@ -1,10 +1,16 | |||||
1 | !include( ../common.pri ) { |
|
1 | !include( ../common.pri ) { | |
2 | error( "Couldn't find the common.pri file!" ) |
|
2 | error( "Couldn't find the common.pri file!" ) | |
3 | } |
|
3 | } | |
4 |
|
4 | |||
5 | !include( ../integrated.pri ) { |
|
5 | !include( ../integrated.pri ) { | |
6 | error( "Couldn't find the integrated.pri file !") |
|
6 | error( "Couldn't find the integrated.pri file !") | |
7 | } |
|
7 | } | |
8 |
|
8 | |||
|
9 | DESTDIR = $$CHART_BUILD_BIN_DIR | |||
|
10 | OBJECTS_DIR = $$CHART_BUILD_DIR/bin/$$TARGET | |||
|
11 | MOC_DIR = $$CHART_BUILD_DIR/bin/$$TARGET | |||
|
12 | UI_DIR = $$CHART_BUILD_DIR/bin/$$TARGET | |||
|
13 | RCC_DIR = $$CHART_BUILD_DIR/bin/$$TARGET | |||
|
14 | ||||
9 | TEMPLATE = app |
|
15 | TEMPLATE = app | |
10 | QT += core gui No newline at end of file |
|
16 | QT += core gui |
@@ -1,31 +1,17 | |||||
1 | #------------------------------------------------- |
|
1 | !include( ../example.pri ) { | |
2 | # |
|
2 | error( "Couldn't find the example.pri file!" ) | |
3 | # Project created by QtCreator 2012-02-14T15:27:32 |
|
|||
4 | # |
|
|||
5 | #------------------------------------------------- |
|
|||
6 |
|
||||
7 | !include( ../../common.pri ) { |
|
|||
8 | error( "Couldn't find the common.pri file!" ) |
|
|||
9 | } |
|
|||
10 | !include( ../../integrated.pri ) { |
|
|||
11 | error( "Couldn't find the integrated.pri file !") |
|
|||
12 | } |
|
3 | } | |
13 |
|
4 | |||
14 | QT += core gui sql |
|
5 | QT+= sql | |
15 |
|
||||
16 | TARGET = gdpbarchart |
|
6 | TARGET = gdpbarchart | |
17 | TEMPLATE = app |
|
|||
18 |
|
||||
19 |
|
||||
20 | SOURCES += main.cpp\ |
|
7 | SOURCES += main.cpp\ | |
21 | widget.cpp |
|
8 | widget.cpp | |
22 |
|
||||
23 | HEADERS += widget.h |
|
9 | HEADERS += widget.h | |
24 |
|
10 | |||
25 | COPY_DATABASE_COMMAND = $$QMAKE_COPY gdpData $$CHART_BUILD_BIN_DIR/gdpData |
|
11 | COPY_DATABASE_COMMAND = $$QMAKE_COPY gdpData $$CHART_BUILD_BIN_DIR/gdpData | |
26 |
|
12 | |||
27 | win32 { |
|
13 | win32 { | |
28 | COPY_DATABASE_COMMAND = $$replace(COPY_DATABASE_COMMAND, "/","\\") |
|
14 | COPY_DATABASE_COMMAND = $$replace(COPY_DATABASE_COMMAND, "/","\\") | |
29 | } |
|
15 | } | |
30 |
|
16 | |||
31 | QMAKE_POST_LINK = $$COPY_DATABASE_COMMAND |
|
17 | QMAKE_POST_LINK = $$COPY_DATABASE_COMMAND |
@@ -1,15 +1,8 | |||||
1 |
!include( ../ |
|
1 | !include( ../example.pri ) { | |
2 |
error( "Couldn't find the |
|
2 | error( "Couldn't find the example.pri file!" ) | |
3 | } |
|
3 | } | |
4 |
|
4 | TARGET = linechart | ||
5 | !include( ../../integrated.pri ) { |
|
|||
6 | error( "Couldn't find the integrated.pri file !") |
|
|||
7 | } |
|
|||
8 |
|
||||
9 | TARGET = lineChart |
|
|||
10 | TEMPLATE = app |
|
|||
11 | QT += core gui |
|
|||
12 | SOURCES += main.cpp |
|
5 | SOURCES += main.cpp | |
13 |
|
6 | |||
14 |
|
7 | |||
15 |
|
8 |
@@ -1,21 +1,12 | |||||
1 |
!include( ../ |
|
1 | !include( ../example.pri ) { | |
2 |
|
|
2 | error( "Couldn't find the example.pri file!" ) | |
3 | } |
|
3 | } | |
4 | !include( ../../integrated.pri ) { |
|
|||
5 | error( "Couldn't find the integrated.pri file !") |
|
|||
6 | } |
|
|||
7 |
|
||||
8 | QT += core gui |
|
|||
9 |
|
||||
10 | TARGET = multichart |
|
4 | TARGET = multichart | |
11 | TEMPLATE = app |
|
|||
12 |
|
||||
13 | SOURCES += main.cpp \ |
|
5 | SOURCES += main.cpp \ | |
14 | multichartwidget.cpp |
|
6 | multichartwidget.cpp | |
15 |
|
||||
16 | HEADERS += \ |
|
7 | HEADERS += \ | |
17 | multichartwidget.h |
|
8 | multichartwidget.h | |
18 |
|
9 | |||
19 |
|
10 | |||
20 |
|
11 | |||
21 |
|
12 |
@@ -1,17 +1,10 | |||||
1 |
!include( ../ |
|
1 | !include( ../example.pri ) { | |
2 |
error( "Couldn't find the |
|
2 | error( "Couldn't find the example.pri file!" ) | |
3 | } |
|
|||
4 |
|
||||
5 | !include( ../../integrated.pri ) { |
|
|||
6 | error( "Couldn't find the integrated.pri file !") |
|
|||
7 | } |
|
3 | } | |
8 |
|
4 | |||
9 | TARGET = percentbarchart |
|
5 | TARGET = percentbarchart | |
10 | TEMPLATE = app |
|
|||
11 | QT += core gui |
|
|||
12 | SOURCES += main.cpp \ |
|
6 | SOURCES += main.cpp \ | |
13 | chartwidget.cpp |
|
7 | chartwidget.cpp | |
14 |
|
||||
15 | HEADERS += \ |
|
8 | HEADERS += \ | |
16 | chartwidget.h |
|
9 | chartwidget.h | |
17 |
|
10 |
@@ -1,19 +1,8 | |||||
1 |
!include( ../ |
|
1 | !include( ../example.pri ) { | |
2 |
|
|
2 | error( "Couldn't find the example.pri file!" ) | |
3 | } |
|
3 | } | |
4 | !include( ../../integrated.pri ) { |
|
|||
5 | error( "Couldn't find the integrated.pri file !") |
|
|||
6 | } |
|
|||
7 |
|
||||
8 | QT += core gui |
|
|||
9 |
|
||||
10 | TARGET = piechart |
|
4 | TARGET = piechart | |
11 | TEMPLATE = app |
|
|||
12 |
|
||||
13 | SOURCES += main.cpp customslice.cpp |
|
5 | SOURCES += main.cpp customslice.cpp | |
14 | HEADERS += customslice.h |
|
6 | HEADERS += customslice.h | |
15 |
|
7 | |||
16 | OBJECTS_DIR = tmp |
|
|||
17 | MOC_DIR = tmp |
|
|||
18 |
|
||||
19 |
|
8 |
@@ -1,17 +1,8 | |||||
1 |
!include( ../ |
|
1 | !include( ../example.pri ) { | |
2 |
|
|
2 | error( "Couldn't find the example.pri file!" ) | |
3 | } |
|
3 | } | |
4 | !include( ../../integrated.pri ) { |
|
|||
5 | error( "Couldn't find the integrated.pri file !") |
|
|||
6 | } |
|
|||
7 |
|
||||
8 | QT += core gui |
|
|||
9 |
|
||||
10 | TARGET = scatter |
|
4 | TARGET = scatter | |
11 | TEMPLATE = app |
|
|||
12 |
|
||||
13 | SOURCES += main.cpp |
|
5 | SOURCES += main.cpp | |
14 |
|
6 | |||
15 | HEADERS += |
|
|||
16 |
|
7 | |||
17 |
|
8 |
@@ -1,17 +1,9 | |||||
1 |
!include( ../ |
|
1 | !include( ../example.pri ) { | |
2 |
error( "Couldn't find the |
|
2 | error( "Couldn't find the example.pri file!" ) | |
3 | } |
|
3 | } | |
4 |
|
||||
5 | !include( ../../integrated.pri ) { |
|
|||
6 | error( "Couldn't find the integrated.pri file !") |
|
|||
7 | } |
|
|||
8 |
|
||||
9 | TARGET = stackedbarchart |
|
4 | TARGET = stackedbarchart | |
10 | TEMPLATE = app |
|
|||
11 | QT += core gui |
|
|||
12 | SOURCES += main.cpp \ |
|
5 | SOURCES += main.cpp \ | |
13 | chartwidget.cpp |
|
6 | chartwidget.cpp | |
14 |
|
||||
15 | HEADERS += \ |
|
7 | HEADERS += \ | |
16 | chartwidget.h |
|
8 | chartwidget.h | |
17 |
|
9 |
@@ -1,17 +1,10 | |||||
1 |
!include( ../ |
|
1 | !include( ../example.pri ) { | |
2 |
error( "Couldn't find the |
|
2 | error( "Couldn't find the example.pri file!" ) | |
3 | } |
|
3 | } | |
4 |
|
4 | TARGET = zoomlinechart | ||
5 | !include( ../../integrated.pri ) { |
|
|||
6 | error( "Couldn't find the integrated.pri file !") |
|
|||
7 | } |
|
|||
8 |
|
||||
9 | TARGET = zoomLineChart |
|
|||
10 | TEMPLATE = app |
|
|||
11 | QT += core gui |
|
|||
12 | HEADERS += chartwidget.h |
|
5 | HEADERS += chartwidget.h | |
13 | SOURCES += main.cpp chartwidget.cpp |
|
6 | SOURCES += main.cpp chartwidget.cpp | |
14 |
|
7 | |||
15 |
|
8 | |||
16 |
|
9 | |||
17 |
|
10 |
@@ -1,56 +1,54 | |||||
1 | integrated_build:{ |
|
1 | integrated_build:{ | |
2 | message('Running integrated build against local libs...') |
|
2 | message('Running integrated build against local libs...') | |
3 | INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR |
|
3 | INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR | |
4 |
|
4 | |||
5 | !win32: { |
|
5 | !win32: { | |
6 | LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR |
|
6 | LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR | |
7 | }else{ |
|
7 | }else{ | |
8 | win32-msvc*: { |
|
8 | win32-msvc*: { | |
9 | # hack fix for error: |
|
9 | # hack fix for error: | |
10 | # "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'" |
|
10 | # "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'" | |
11 | QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR |
|
11 | QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR | |
12 | }else{ |
|
12 | }else{ | |
13 | LIBS += -L $$CHART_BUILD_LIB_DIR |
|
13 | LIBS += -L $$CHART_BUILD_LIB_DIR | |
14 | } |
|
14 | } | |
15 | } |
|
15 | } | |
16 |
|
16 | |||
17 | DESTDIR = $$CHART_BUILD_BIN_DIR |
|
|||
18 |
|
||||
19 | CONFIG(debug, debug|release) { |
|
17 | CONFIG(debug, debug|release) { | |
20 | LIBS += -lQtCommercialChartd |
|
18 | LIBS += -lQtCommercialChartd | |
21 | #this is ugly hack to work around missing rpath, it simply copies lib |
|
19 | #this is ugly hack to work around missing rpath, it simply copies lib | |
22 | win32:{ |
|
20 | win32:{ | |
23 | copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll |
|
21 | copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll | |
24 | copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChartd.dll $$CHART_BUILD_BIN_DIR |
|
22 | copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChartd.dll $$CHART_BUILD_BIN_DIR | |
25 | copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChartd.dll |
|
23 | copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChartd.dll | |
26 | PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll |
|
24 | PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll | |
27 | QMAKE_EXTRA_TARGETS +=copylib |
|
25 | QMAKE_EXTRA_TARGETS +=copylib | |
28 | } |
|
26 | } | |
29 | } else { |
|
27 | } else { | |
30 | LIBS += -lQtCommercialChart |
|
28 | LIBS += -lQtCommercialChart | |
31 |
|
29 | |||
32 | #this is ugly hack to work around missing rpath, it simply copies lib |
|
30 | #this is ugly hack to work around missing rpath, it simply copies lib | |
33 | win32: { |
|
31 | win32: { | |
34 | copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChart |
|
32 | copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChart | |
35 | copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChart.dll $$CHART_BUILD_BIN_DIR |
|
33 | copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChart.dll $$CHART_BUILD_BIN_DIR | |
36 | copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChart.dll |
|
34 | copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChart.dll | |
37 | PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChart |
|
35 | PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChart | |
38 | QMAKE_EXTRA_TARGETS +=copylib |
|
36 | QMAKE_EXTRA_TARGETS +=copylib | |
39 | } |
|
37 | } | |
40 | } |
|
38 | } | |
41 |
|
39 | |||
42 | mac: { |
|
40 | mac: { | |
43 | # This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX |
|
41 | # This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX | |
44 | QMAKE_POST_LINK += install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/chartwidgettest.app/Contents/MacOS/chartwidgettest |
|
42 | QMAKE_POST_LINK += install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/chartwidgettest.app/Contents/MacOS/chartwidgettest | |
45 | QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/barchart.app/Contents/MacOS/barchart |
|
43 | QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/barchart.app/Contents/MacOS/barchart | |
46 | QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/colorlineChart.app/Contents/MacOS/colorlineChart |
|
44 | QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/colorlineChart.app/Contents/MacOS/colorlineChart | |
47 | QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/lineChart.app/Contents/MacOS/lineChart |
|
45 | QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/lineChart.app/Contents/MacOS/lineChart | |
48 | QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/percentbarchart.app/Contents/MacOS/percentbarchart |
|
46 | QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/percentbarchart.app/Contents/MacOS/percentbarchart | |
49 | QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/stackedbarchart.app/Contents/MacOS/stackedbarchart |
|
47 | QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/stackedbarchart.app/Contents/MacOS/stackedbarchart | |
50 | QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/zoomLineChart.app/Contents/MacOS/zoomLineChart |
|
48 | QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/zoomLineChart.app/Contents/MacOS/zoomLineChart | |
51 | } |
|
49 | } | |
52 |
|
50 | |||
53 | } else { |
|
51 | } else { | |
54 | message('Running build aginst system libs...') |
|
52 | message('Running build aginst system libs...') | |
55 | CONFIG+=qtcommercialchart |
|
53 | CONFIG+=qtcommercialchart | |
56 | } |
|
54 | } |
@@ -1,11 +1,19 | |||||
1 | !include( ../../common.pri ) { |
|
1 | !include( ../../common.pri ) { | |
2 | error( "Couldn't find the common.pri file!" ) |
|
2 | error( "Couldn't find the common.pri file!" ) | |
3 | } |
|
3 | } | |
4 |
|
4 | |||
5 | !include( ../../integrated.pri ) { |
|
5 | !include( ../../integrated.pri ) { | |
6 | error( "Couldn't find the integrated.pri file !") |
|
6 | error( "Couldn't find the integrated.pri file !") | |
7 | } |
|
7 | } | |
8 |
|
8 | |||
9 | TEMPLATE = app |
|
9 | TEMPLATE = app | |
10 | CONFIG += qtestlib |
|
10 | CONFIG += qtestlib | |
|
11 | ||||
|
12 | DESTDIR = $$CHART_BUILD_BIN_DIR/test | |||
|
13 | OBJECTS_DIR = $$CHART_BUILD_DIR/test/$$TARGET | |||
|
14 | MOC_DIR = $$CHART_BUILD_DIR/test/$$TARGET | |||
|
15 | UI_DIR = $$CHART_BUILD_DIR/test/$$TARGET | |||
|
16 | RCC_DIR = $$CHART_BUILD_DIR/test/$$TARGET | |||
|
17 | ||||
11 | !contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_") |
|
18 | !contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_") | |
|
19 |
General Comments 0
You need to be logged in to leave comments.
Login now