diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-03-22 09:40:56 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-03-22 09:40:56 +0200 |
commit | 99d6ecad75bc7918984102b5b59dd5046922fd27 (patch) | |
tree | 2d92d78f57296721ff29391f97b710f4b0beb7ec | |
parent | c44a116d4ae8fc3f2f2ddd320e1fd480c026c65b (diff) |
Enable building for qnx on windows
Reviewed-by: Mika Salmela
-rw-r--r-- | charts.pro | 4 | ||||
-rw-r--r-- | src/src.pro | 6 |
2 files changed, 5 insertions, 5 deletions
@@ -21,9 +21,9 @@ INSTALLS += feature CHARTS_VERSION = 1.2.1 CHARTS_VERSION_TAG = 121 -win32: { +contains(QMAKE_HOST.os, Windows) { QDOC_CONF = $$CHART_BUILD_DOC_DIR\\qcharts.qdocconf - win32-g++: { + win32-g++|qnx { VERSION_SETTINGS = \ set QT_CHARTS_VERSION=$$CHARTS_VERSION&& set QT_CHARTS_VERSION_TAG=$$CHARTS_VERSION_TAG&& } else { diff --git a/src/src.pro b/src/src.pro index 48a83a36..bfb90ba0 100644 --- a/src/src.pro +++ b/src/src.pro @@ -16,7 +16,7 @@ win32-msvc*: { # QMAKE_CXXFLAGS += -Werror } -unix:{ +unix:!qnx { QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden } @@ -92,7 +92,7 @@ RCC_DIR = $$CHART_BUILD_DIR/lib !exists($$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal) { system($$QMAKE_MKDIR $$CHART_BUILD_PUBLIC_HEADER_DIR) - win32:{ + contains(QMAKE_HOST.os, Windows) { command = "echo $${LITERAL_HASH}include \"qchartglobal.h\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal" }else{ command = "echo \"$${LITERAL_HASH}include \\\"qchartglobal.h\\\"\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal" @@ -112,7 +112,7 @@ for(file, PUBLIC_HEADERS) { class = $$split(class,' ') class = $$replace(class,' ','') class = $$member(class,0) - win32:{ + contains(QMAKE_HOST.os, Windows) { command = "echo $${LITERAL_HASH}include \"$$name\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class" }else{ command = "echo \"$${LITERAL_HASH}include \\\"$$name\\\"\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class" |