HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1036:8d9276dbb5dd

Added system flag to conditions for install_name_tool

Tero Ahola -

r1036:8d9276dbb5dd

parent child

Context file:

r1036:8d9276dbb5dd

Expand all files

demos/chartthemes/chartthemes.pro +1 -1

             !include( ../demos.pri ):error( "Couldn't find the demos.pri file!" )
             TARGET = chartthemes
             SOURCES = main.cpp themewidget.cpp
             HEADERS = themewidget.h
             # This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX
             #CHARTS_LIB_NAME = "lib"$$LIBRARY_NAME".1.dylib"
             #CONFIG(debug, debug|release) {
             #    CHARTS_LIB_NAME = "lib"$$LIBRARY_NAME".1.dylib"
             #}
-            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_DEMOS_BIN_DIR"
+            !system:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_DEMOS_BIN_DIR"

demos/dynamicspline/dynamicspline.pro +1 -1

             !include( ../demos.pri ):error( "Couldn't find the demos.pri file!" )
             TARGET = dynamicspline
             HEADERS += chart.h
             SOURCES += main.cpp chart.cpp
-            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_DEMOS_BIN_DIR"
+            !system:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_DEMOS_BIN_DIR"

demos/piechartcustomization/piechartcustomization.pro +1 -1

             !include( ../demos.pri ) {
              error( "Couldn't find the demos.pri file!" )
             }
             TARGET = piechartcustomization
             SOURCES += main.cpp \
                 pentool.cpp \
                 brushtool.cpp \
                 customslice.cpp \
                 mainwidget.cpp
             HEADERS += \
                 pentool.h \
                 brushtool.h \
                 customslice.h \
                 mainwidget.h
-            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_DEMOS_BIN_DIR"
+            !system:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_DEMOS_BIN_DIR"

demos/qmlchart/qmlchart.pro +1 -1

             !include( ../demos.pri ) {
                 error( "Couldn't find the demos.pri file!" )
             }
             RESOURCES += resources.qrc
             SOURCES += main.cpp
             include(qmlapplicationviewer/qmlapplicationviewer.pri)
-            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_DEMOS_BIN_DIR"
+            !system:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_DEMOS_BIN_DIR"

examples/areachart/areachart.pro +1 -1

             !include( ../examples.pri ) {
              error( "Couldn't find the examples.pri file!" )
             }
             TARGET = areachart
             SOURCES += main.cpp
-            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"
+            !system:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

examples/barchart/barchart.pro +1 -1

             !include( ../examples.pri ) {
              error( "Couldn't find the examples.pri file!" )
             }
             TARGET = barchart
             SOURCES += main.cpp
-            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"
+            !system:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

examples/customchart/customchart.pro +1 -1

             !include( ../examples.pri ) {
              error( "Couldn't find the examples.pri file!" )
             }
             TARGET = customchart
             SOURCES += main.cpp
-            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"
+            !system:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

examples/linechart/linechart.pro +1 -1

             !include( ../examples.pri ) {
              error( "Couldn't find the examples.pri file!" )
             }
             TARGET = linechart
             SOURCES += main.cpp
-            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"
+            !system:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

examples/modeldata/modeldata.pro +1 -1

             !include( ../examples.pri ) {
                 error( "Couldn't find the examples.pri file!" )
             }
             QT       += core gui
             TARGET = modeldata
             TEMPLATE = app
             SOURCES += main.cpp\
                     tablewidget.cpp \
                 customtablemodel.cpp
             HEADERS  += tablewidget.h \
                 customtablemodel.h
-            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"
+            !system:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

examples/percentbarchart/percentbarchart.pro +1 -1

             !include( ../examples.pri ) {
              error( "Couldn't find the examples.pri file!" )
             }
             TARGET = percentbarchart
             SOURCES += main.cpp
-            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"
+            !system:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

examples/piechart/piechart.pro +1 -1

             !include( ../examples.pri ) {
              error( "Couldn't find the examples.pri file!" )
             }
             TARGET = piechart
             SOURCES += main.cpp
-            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"
+            !system:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

examples/piechartdrilldown/piechartdrilldown.pro +1 -1

             !include( ../examples.pri ) {
              error( "Couldn't find the examples.pri file!" )
             }
             TARGET = piechartdrilldown
             SOURCES += main.cpp \
                 drilldownslice.cpp \
                 drilldownchart.cpp
             HEADERS += \
                 drilldownchart.h \
                 drilldownslice.h
-            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"
+            !system:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

examples/presenterchart/presenterchart.pro +1 -1

             !include( ../examples.pri ) {
              error( "Couldn't find the examples.pri file!" )
             }
             TARGET = presenterchart
             HEADERS += chartview.h
             SOURCES += main.cpp chartview.cpp
-            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"
+            !system:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

examples/scatterchart/scatterchart.pro +1 -1

             !include( ../examples.pri ) {
                 error( "Couldn't find the examples.pri file!" )
             }
             TARGET = scatterchart
             SOURCES += main.cpp \
                 chartview.cpp
             HEADERS += \
                 chartview.h
-            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"
+            !system:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

examples/scatterinteractions/scatterinteractions.pro +1 -1

             !include( ../examples.pri ) {
                 error( "Couldn't find the examples.pri file!" )
             }
             TARGET = scatterinteractions
             SOURCES += main.cpp \
                 chartview.cpp
             HEADERS  += \
                 chartview.h
-            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"
+            !system:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

examples/splinechart/splinechart.pro +1 -1

             !include( ../examples.pri ) {
              error( "Couldn't find the examples.pri file!" )
             }
             TARGET = splinechart
             SOURCES += main.cpp
-            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"
+            !system:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

examples/stackedbarchart/stackedbarchart.pro +1 -1

             !include( ../examples.pri ) {
              error( "Couldn't find the examples.pri file!" )
             }
             TARGET = stackedbarchart
             SOURCES += main.cpp
-            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"
+            !system:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

examples/stackedbarchartdrilldown/stackedbarchartdrilldown.pro +1 -1

             !include( ../examples.pri ) {
              error( "Couldn't find the examples.pri file!" )
             }
             TARGET = stackedbarchartdrilldown
             SOURCES += main.cpp drilldownseries.cpp drilldownchart.cpp
             HEADERS += drilldownseries.h drilldownchart.h
-            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"
+            !system:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

examples/zoomlinechart/zoomlinechart.pro +1 -1

             !include( ../examples.pri ) {
              error( "Couldn't find the examples.pri file!" )
             }
             TARGET = zoomlinechart
             HEADERS += chartview.h
             SOURCES += main.cpp chartview.cpp
-            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"
+            !system:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR"

qmlplugin/qmlplugin.pro +1 -2

-            CURRENTLY_BUILDING_COMPONENTS = "qmlplugin"
             TEMPLATE = lib
             TARGET = qtcommercialchartqml
             CONFIG += qt plugin
             QT += declarative
             !include( ../config.pri ) {
                 error( "Couldn't find the config.pri file!" )
             }
             DESTDIR = $$CHART_BUILD_PLUGIN_DIR
             contains(QT_MAJOR_VERSION, 5) {
                 # TODO: QtQuick2 not supported by the implementation currently
                 DEFINES += QTQUICK2
             }
             OBJECTS_DIR = $$CHART_BUILD_DIR/plugin
             MOC_DIR = $$CHART_BUILD_DIR/plugin
             UI_DIR = $$CHART_BUILD_DIR/plugin
             RCC_DIR = $$CHART_BUILD_DIR/plugin
             SOURCES += \
                 plugin.cpp \
                 declarativechart.cpp \
                 declarativexyseries.cpp \
                 declarativexypoint.cpp \
                 declarativelineseries.cpp \
                 declarativesplineseries.cpp \
                 declarativeareaseries.cpp \
                 declarativescatterseries.cpp \
                 declarativepieseries.cpp \
                 declarativebarseries.cpp
             HEADERS += \
                 declarativechart.h \
                 declarativexyseries.h \
                 declarativexypoint.h \
                 declarativelineseries.h \
                 declarativesplineseries.h \
                 declarativeareaseries.h \
                 declarativescatterseries.h \
                 declarativepieseries.h \
                 declarativebarseries.h
             TARGETPATH = QtCommercial/Chart
             target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
             qmldir.files += $$PWD/qmldir
             qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
             INSTALLS += target qmldir
             FILE = $$PWD/qmldir
             win32:{FILE = $$replace(FILE, "/","\\")}
             QMAKE_POST_LINK += $$QMAKE_COPY $$FILE $$CHART_BUILD_PLUGIN_DIR
-            mac: QMAKE_POST_LINK += " & $$MAC_POST_LINK_PREFIX $$MAC_PLUGINS_BIN_DIR"
+            !system:mac: QMAKE_POST_LINK += " & $$MAC_POST_LINK_PREFIX $$MAC_PLUGINS_BIN_DIR"

test/auto/chartdataset/chartdataset.pro +1 -1

             !include( ../auto.pri ) {
                 error( "Couldn't find the auto.pri file!" )
             }
             SOURCES += tst_chartdataset.cpp
-            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR"
+            !system:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR"

test/auto/domain/domain.pro +1 -1

             !include( ../auto.pri ) {
                 error( "Couldn't find the auto.pri file!" )
             }
             SOURCES += tst_domain.cpp
-            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR"
+            !system:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR"

test/auto/qchart/qchart.pro +1 -1

             !include( ../auto.pri ) {
                 error( "Couldn't find the auto.pri file!" )
             }
             SOURCES += tst_qchart.cpp
-            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR"
+            !system:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR"

test/auto/qchartview/qchartview.pro +1 -1

             !include( ../auto.pri ) {
                 error( "Couldn't find the auto.pri file!" )
             }
             SOURCES += tst_qchartview.cpp
-            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR"
+            !system:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR"

test/chartwidgettest/chartwidgettest.pro +1 -1

             !include( ../test.pri ) {
                 error( "Couldn't find the test.pri file!" )
             }
             TEMPLATE = app
             QT += core gui
             contains(QT_MAJOR_VERSION, 5) {
                 QT += widgets
             }
             SOURCES += main.cpp \
                 mainwidget.cpp \
                 dataseriedialog.cpp
             HEADERS += \
                 mainwidget.h \
                 dataseriedialog.h
-            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_TESTS_BIN_DIR"
+            !system:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_TESTS_BIN_DIR"

test/gdpbarchart/gdpbarchart.pro +1 -1

             !include( ../test.pri ) {
                 error( "Couldn't find the test.pri file!" )
             }
             QT+= sql
             TARGET = gdpbarchart
             SOURCES += main.cpp\
                     widget.cpp
             HEADERS  += widget.h
             !mac {
                 FILE = $$PWD/gdpData
                 win32:{FILE = $$replace(FILE, "/","\\")}
                 DESTINATION = $$CHART_BUILD_BIN_DIR/test
                 win32:{DESTINATION = $$replace(DESTINATION, "/","\\")}
                 # TODO: QMAKE_POST_LINK does not work on mac; how to copy the data file?
                 QMAKE_POST_LINK += $$QMAKE_COPY $$FILE $$CHART_BUILD_BIN_DIR
             }
-            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_TESTS_BIN_DIR"
+            !system:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_TESTS_BIN_DIR"

test/tablemodelchart/tablemodelchart.pro +1 -1

             !include( ../test.pri ) {
                 error( "Couldn't find the test.pri file!" )
             }
             QT       += core gui
             TARGET = tablemodelchart
             TEMPLATE = app
             SOURCES += main.cpp\
                     tablewidget.cpp \
                 customtablemodel.cpp
             HEADERS  += tablewidget.h \
                 customtablemodel.h
-            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_TESTS_BIN_DIR"
+            !system:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_TESTS_BIN_DIR"

test/wavechart/wavechart.pro +1 -1

             !include( ../test.pri ) {
              error( "Couldn't find the examples.pri file!" )
             }
             QT+=opengl
             TARGET = wavechart
             SOURCES += main.cpp wavechart.cpp
             HEADERS += wavechart.h
-            mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_TESTS_BIN_DIR"
+            !system:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_TESTS_BIN_DIR"

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages