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

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

Make qmlplugin work on OSX integrated build
Tero Ahola -
r641:a23a8a6d17c9
parent child
Show More
Show file before | Show file after | Hide comments
@@ -37,9 +37,22 integrated_build:{
37 }
37 }
38
38
39 mac: {
39 mac: {
40 CHARTS_LIB_NAME = libQtCommercialChart.1.dylib
41 CONFIG(debug, debug|release) {
42 CHARTS_LIB_NAME = libQtCommercialChartd.1.dylib
43 }
44
40 # This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX
45 # This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX
41 exists($$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET) {
46 exists($$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET) {
42 QMAKE_POST_LINK+=install_name_tool -change "libQtCommercialChartd.1.dylib" $$CHART_BUILD_LIB_DIR"/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET
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
48 #message($$QMAKE_POST_LINK)
49 }
50
51 # Hack to make qml plugins available as internal build versions and to make the plugins use
52 # the internal version of the QtCommercial Charts library on OSX
53 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""
43 #message($$QMAKE_POST_LINK)
56 # message($$QMAKE_POST_LINK)
44 }
57 }
45 }
58 }
Show file before | Show file after | Hide comments
@@ -1,3 +1,8
1 TEMPLATE = lib
2 TARGET = qtcommercialchartqml
3 CONFIG += qt plugin
4 QT += declarative
5
1 !include( ../common.pri ) {
6 !include( ../common.pri ) {
2 error( "Couldn't find the common.pri file!" )
7 error( "Couldn't find the common.pri file!" )
3 }
8 }
@@ -5,12 +10,7
5 error( "Couldn't find the integrated.pri file !")
10 error( "Couldn't find the integrated.pri file !")
6 }
11 }
7
12
8 TEMPLATE = lib
9 TARGET = qtcommercialchartqml
10 DESTDIR = $$CHART_BUILD_PLUGIN_DIR
13 DESTDIR = $$CHART_BUILD_PLUGIN_DIR
11 CONFIG += qt plugin
12 QT += declarative
13
14 contains(QT_MAJOR_VERSION, 5) {
14 contains(QT_MAJOR_VERSION, 5) {
15 # TODO: QtQuick2 not supported by the implementation currently
15 # TODO: QtQuick2 not supported by the implementation currently
16 DEFINES += QTQUICK2
16 DEFINES += QTQUICK2
@@ -35,8 +35,6 HEADERS += \
35 declarativepieseries.h \
35 declarativepieseries.h \
36 declarativelineseries.h
36 declarativelineseries.h
37
37
38 QMAKE_POST_LINK = $$QMAKE_COPY qmldir $$CHART_BUILD_PLUGIN_DIR
39
40 TARGETPATH = QtCommercial/Chart
38 TARGETPATH = QtCommercial/Chart
41 target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
39 target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
42 qmldir.files += $$PWD/qmldir
40 qmldir.files += $$PWD/qmldir
General Comments 0
You need to be logged in to leave comments. Login now