@@ -1,62 +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 | # This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX | |
|
40 | 41 | CHARTS_LIB_NAME = libQtCommercialChart.1.dylib |
|
41 | 42 | CONFIG(debug, debug|release) { |
|
42 | 43 | CHARTS_LIB_NAME = libQtCommercialChartd.1.dylib |
|
43 | 44 | } |
|
44 | ||
|
45 | # This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX | |
|
46 |
|
|
|
47 | QMAKE_POST_LINK += install_name_tool -change $$CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$CHARTS_LIB_NAME $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET | |
|
45 | TARGET_PATH = "" | |
|
46 | exists ($$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET) { | |
|
47 | TARGET_PATH = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET | |
|
48 | } | |
|
49 | exists ($$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET) { | |
|
50 | # Executable in test folder | |
|
51 | TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET | |
|
52 | } | |
|
53 | exists ($$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET) { | |
|
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 | |
|
56 | } | |
|
57 | exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") { | |
|
58 | # Plugin | |
|
59 | TARGET_PATH = $$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib" | |
|
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 | |
|
48 | 63 | #message($$QMAKE_POST_LINK) |
|
49 | 64 | } |
|
50 | 65 | |
|
51 |
# Hack to make qml plugins available as internal build versions |
|
|
52 | # the internal version of the QtCommercial Charts library on OSX | |
|
66 | # Hack to make qml plugins available as internal build versions | |
|
53 | 67 | exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") { |
|
54 |
QMAKE_POST_LINK += "$$QMAKE_COPY qmldir $$CHART_BUILD_PLUGIN_DIR |
|
|
55 | QMAKE_POST_LINK += "install_name_tool -change $$CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$CHARTS_LIB_NAME $$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib"" | |
|
56 | # message($$QMAKE_POST_LINK) | |
|
68 | QMAKE_POST_LINK += "& $$QMAKE_COPY qmldir $$CHART_BUILD_PLUGIN_DIR" | |
|
69 | #message($$QMAKE_POST_LINK) | |
|
57 | 70 | } |
|
58 | 71 | } |
|
59 | 72 | |
|
60 | 73 | } else { |
|
61 | 74 | CONFIG += qtcommercialchart |
|
62 | 75 | } |
@@ -1,19 +1,18 | |||
|
1 | 1 | !include( ../test.pri ) { |
|
2 | 2 | error( "Couldn't find the test.pri file!" ) |
|
3 | 3 | } |
|
4 | 4 | |
|
5 | TARGET = chartwidgettest | |
|
6 | 5 | TEMPLATE = app |
|
7 | 6 | |
|
8 | 7 | QT += core gui |
|
9 | 8 | contains(QT_MAJOR_VERSION, 5) { |
|
10 | 9 | QT += widgets |
|
11 | 10 | } |
|
12 | 11 | |
|
13 | 12 | SOURCES += main.cpp \ |
|
14 | 13 | mainwidget.cpp \ |
|
15 | 14 | dataseriedialog.cpp |
|
16 | 15 | |
|
17 | 16 | HEADERS += \ |
|
18 | 17 | mainwidget.h \ |
|
19 | 18 | dataseriedialog.h |
General Comments 0
You need to be logged in to leave comments.
Login now