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

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

Enable building for qnx on windows...
Miikka Heikkinen -
r2455:99d6ecad75bc
parent child
Show More
Side by Side Unified
Context file:
r2455:99d6ecad75bc Loading diff...:
Show file before | Show file after | Hide comments
@@ -21,9 +21,9 INSTALLS += feature
21 CHARTS_VERSION = 1.2.1
21 CHARTS_VERSION = 1.2.1
22 CHARTS_VERSION_TAG = 121
22 CHARTS_VERSION_TAG = 121
23
23
24 win32: {
24 contains(QMAKE_HOST.os, Windows) {
25 QDOC_CONF = $$CHART_BUILD_DOC_DIR\\qcharts.qdocconf
25 QDOC_CONF = $$CHART_BUILD_DOC_DIR\\qcharts.qdocconf
26 win32-g++: {
26 win32-g++|qnx {
27 VERSION_SETTINGS = \
27 VERSION_SETTINGS = \
28 set QT_CHARTS_VERSION=$$CHARTS_VERSION&& set QT_CHARTS_VERSION_TAG=$$CHARTS_VERSION_TAG&&
28 set QT_CHARTS_VERSION=$$CHARTS_VERSION&& set QT_CHARTS_VERSION_TAG=$$CHARTS_VERSION_TAG&&
29 } else {
29 } else {
Show file before | Show file after | Hide comments
@@ -16,7 +16,7 win32-msvc*: {
16 # QMAKE_CXXFLAGS += -Werror
16 # QMAKE_CXXFLAGS += -Werror
17 }
17 }
18
18
19 unix:{
19 unix:!qnx {
20 QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
20 QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
21 }
21 }
22
22
@@ -92,7 +92,7 RCC_DIR = $$CHART_BUILD_DIR/lib
92 !exists($$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal)
92 !exists($$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal)
93 {
93 {
94 system($$QMAKE_MKDIR $$CHART_BUILD_PUBLIC_HEADER_DIR)
94 system($$QMAKE_MKDIR $$CHART_BUILD_PUBLIC_HEADER_DIR)
95 win32:{
95 contains(QMAKE_HOST.os, Windows) {
96 command = "echo $${LITERAL_HASH}include \"qchartglobal.h\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal"
96 command = "echo $${LITERAL_HASH}include \"qchartglobal.h\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal"
97 }else{
97 }else{
98 command = "echo \"$${LITERAL_HASH}include \\\"qchartglobal.h\\\"\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal"
98 command = "echo \"$${LITERAL_HASH}include \\\"qchartglobal.h\\\"\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal"
@@ -112,7 +112,7 for(file, PUBLIC_HEADERS) {
112 class = $$split(class,' ')
112 class = $$split(class,' ')
113 class = $$replace(class,' ','')
113 class = $$replace(class,' ','')
114 class = $$member(class,0)
114 class = $$member(class,0)
115 win32:{
115 contains(QMAKE_HOST.os, Windows) {
116 command = "echo $${LITERAL_HASH}include \"$$name\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class"
116 command = "echo $${LITERAL_HASH}include \"$$name\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class"
117 }else{
117 }else{
118 command = "echo \"$${LITERAL_HASH}include \\\"$$name\\\"\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class"
118 command = "echo \"$${LITERAL_HASH}include \\\"$$name\\\"\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class"
General Comments 0
You need to be logged in to leave comments. Login now