From 9a2b5d956bb6cc0e1a9377e485805c0523e1b07f 2012-06-07 11:26:26 From: Tero Ahola Date: 2012-06-07 11:26:26 Subject: [PATCH] OSX install name tool now executed only on QtCommercialChart library during build --- diff --git a/config.pri b/config.pri index 6f103f8..e47c52b 100644 --- a/config.pri +++ b/config.pri @@ -79,25 +79,9 @@ development_build: { CONFIG(debug, debug|release) { mac: LIBRARY_NAME = $$join(LIBRARY_NAME,,,_debug) win32: LIBRARY_NAME = $$join(LIBRARY_NAME,,,d) - } - - LIBS += -l$$LIBRARY_NAME - - mac: { - # This is a hack; we define variables for easier install_name_tool calls from project files of OSX executables/libraries - # install_name_tool is used to update the dependencies to chart library to match the local build folder - MAC_CHARTS_LIB_NAME = "lib"$$LIBRARY_NAME".1.dylib" - CONFIG(debug, debug|release) { - MAC_CHARTS_LIB_NAME = "lib"$$LIBRARY_NAME".1.dylib" - } - MAC_POST_LINK_PREFIX = install_name_tool -change $$MAC_CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$MAC_CHARTS_LIB_NAME - MAC_DEMOS_BIN_DIR = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET - MAC_EXAMPLES_BIN_DIR = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET - MAC_TESTS_BIN_DIR = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET - MAC_AUTOTESTS_BIN_DIR = $$CHART_BUILD_BIN_DIR"/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET - MAC_PLUGINS_BIN_DIR = $$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib" } - + + LIBS += -l$$LIBRARY_NAME } else { CONFIG += qtcommercialchart } diff --git a/demos/chartthemes/chartthemes.pro b/demos/chartthemes/chartthemes.pro index d807380..d9a61a7 100644 --- a/demos/chartthemes/chartthemes.pro +++ b/demos/chartthemes/chartthemes.pro @@ -2,11 +2,3 @@ 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" -#} - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_DEMOS_BIN_DIR" diff --git a/demos/dynamicspline/dynamicspline.pro b/demos/dynamicspline/dynamicspline.pro index 03e64ac..697a864 100644 --- a/demos/dynamicspline/dynamicspline.pro +++ b/demos/dynamicspline/dynamicspline.pro @@ -2,5 +2,3 @@ TARGET = dynamicspline HEADERS += chart.h SOURCES += main.cpp chart.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_DEMOS_BIN_DIR" diff --git a/demos/piechartcustomization/piechartcustomization.pro b/demos/piechartcustomization/piechartcustomization.pro index 4f0f43a..9698b48 100644 --- a/demos/piechartcustomization/piechartcustomization.pro +++ b/demos/piechartcustomization/piechartcustomization.pro @@ -13,6 +13,3 @@ HEADERS += \ brushtool.h \ customslice.h \ mainwidget.h - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_DEMOS_BIN_DIR" - diff --git a/demos/qmlchart/qmlchart.pro b/demos/qmlchart/qmlchart.pro index 394db8f..8229427 100644 --- a/demos/qmlchart/qmlchart.pro +++ b/demos/qmlchart/qmlchart.pro @@ -6,5 +6,3 @@ RESOURCES += resources.qrc SOURCES += main.cpp include(qmlapplicationviewer/qmlapplicationviewer.pri) - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_DEMOS_BIN_DIR" diff --git a/demos/qmlcustomizations/qmlcustomizations.pro b/demos/qmlcustomizations/qmlcustomizations.pro index 394db8f..8229427 100644 --- a/demos/qmlcustomizations/qmlcustomizations.pro +++ b/demos/qmlcustomizations/qmlcustomizations.pro @@ -6,5 +6,3 @@ RESOURCES += resources.qrc SOURCES += main.cpp include(qmlapplicationviewer/qmlapplicationviewer.pri) - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_DEMOS_BIN_DIR" diff --git a/demos/qmlcustommodel/qmlcustommodel.pro b/demos/qmlcustommodel/qmlcustommodel.pro index faae6fa..a8023ec 100644 --- a/demos/qmlcustommodel/qmlcustommodel.pro +++ b/demos/qmlcustommodel/qmlcustommodel.pro @@ -10,5 +10,3 @@ HEADERS += customtablemodel.h \ declarativemodel.h include(qmlapplicationviewer/qmlapplicationviewer.pri) - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_DEMOS_BIN_DIR" diff --git a/demos/qmlf1legends/qmlf1legends.pro b/demos/qmlf1legends/qmlf1legends.pro index 394db8f..8229427 100644 --- a/demos/qmlf1legends/qmlf1legends.pro +++ b/demos/qmlf1legends/qmlf1legends.pro @@ -6,5 +6,3 @@ RESOURCES += resources.qrc SOURCES += main.cpp include(qmlapplicationviewer/qmlapplicationviewer.pri) - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_DEMOS_BIN_DIR" diff --git a/demos/qmlweather/qmlweather.pro b/demos/qmlweather/qmlweather.pro index 394db8f..8229427 100644 --- a/demos/qmlweather/qmlweather.pro +++ b/demos/qmlweather/qmlweather.pro @@ -6,5 +6,3 @@ RESOURCES += resources.qrc SOURCES += main.cpp include(qmlapplicationviewer/qmlapplicationviewer.pri) - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_DEMOS_BIN_DIR" diff --git a/examples/areachart/areachart.pro b/examples/areachart/areachart.pro index 1eed45b..e8e1a07 100644 --- a/examples/areachart/areachart.pro +++ b/examples/areachart/areachart.pro @@ -3,5 +3,3 @@ } TARGET = areachart SOURCES += main.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" diff --git a/examples/barchart/barchart.pro b/examples/barchart/barchart.pro index 5a35e76..14db3c8 100644 --- a/examples/barchart/barchart.pro +++ b/examples/barchart/barchart.pro @@ -4,5 +4,3 @@ TARGET = barchart SOURCES += main.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" diff --git a/examples/barmodelmapper/barmodelmapper.pro b/examples/barmodelmapper/barmodelmapper.pro index 93c3e7e..91b8f36 100644 --- a/examples/barmodelmapper/barmodelmapper.pro +++ b/examples/barmodelmapper/barmodelmapper.pro @@ -14,5 +14,3 @@ SOURCES += main.cpp\ HEADERS += tablewidget.h \ customtablemodel.h - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" diff --git a/examples/customchart/customchart.pro b/examples/customchart/customchart.pro index e62e2cf..5f3f738 100644 --- a/examples/customchart/customchart.pro +++ b/examples/customchart/customchart.pro @@ -4,5 +4,3 @@ TARGET = customchart SOURCES += main.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" diff --git a/examples/groupedbarchart/groupedbarchart.pro b/examples/groupedbarchart/groupedbarchart.pro index 463f173..26cd4b8 100644 --- a/examples/groupedbarchart/groupedbarchart.pro +++ b/examples/groupedbarchart/groupedbarchart.pro @@ -4,5 +4,3 @@ TARGET = groupedbarchart SOURCES += main.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" diff --git a/examples/legend/legend.pro b/examples/legend/legend.pro index b731c14..5e22fb2 100644 --- a/examples/legend/legend.pro +++ b/examples/legend/legend.pro @@ -6,7 +6,5 @@ TARGET = legend SOURCES += main.cpp \ mainwidget.cpp -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" - HEADERS += \ mainwidget.h diff --git a/examples/linechart/linechart.pro b/examples/linechart/linechart.pro index ef3276d..d3eb640 100644 --- a/examples/linechart/linechart.pro +++ b/examples/linechart/linechart.pro @@ -3,5 +3,3 @@ } TARGET = linechart SOURCES += main.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" diff --git a/examples/modeldata/modeldata.pro b/examples/modeldata/modeldata.pro index b7ab87f..7c302bd 100644 --- a/examples/modeldata/modeldata.pro +++ b/examples/modeldata/modeldata.pro @@ -14,5 +14,3 @@ SOURCES += main.cpp\ HEADERS += tablewidget.h \ customtablemodel.h - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" diff --git a/examples/percentbarchart/percentbarchart.pro b/examples/percentbarchart/percentbarchart.pro index c1b09b3..983159d 100644 --- a/examples/percentbarchart/percentbarchart.pro +++ b/examples/percentbarchart/percentbarchart.pro @@ -4,5 +4,3 @@ TARGET = percentbarchart SOURCES += main.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" diff --git a/examples/piechart/piechart.pro b/examples/piechart/piechart.pro index 2e24f62..7bd4851 100644 --- a/examples/piechart/piechart.pro +++ b/examples/piechart/piechart.pro @@ -3,5 +3,3 @@ } TARGET = piechart SOURCES += main.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" diff --git a/examples/piechartdrilldown/piechartdrilldown.pro b/examples/piechartdrilldown/piechartdrilldown.pro index 8fcf6e2..0f9626c 100644 --- a/examples/piechartdrilldown/piechartdrilldown.pro +++ b/examples/piechartdrilldown/piechartdrilldown.pro @@ -9,5 +9,3 @@ SOURCES += main.cpp \ HEADERS += \ drilldownchart.h \ drilldownslice.h - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" diff --git a/examples/presenterchart/presenterchart.pro b/examples/presenterchart/presenterchart.pro index 52a1a46..1637b84 100644 --- a/examples/presenterchart/presenterchart.pro +++ b/examples/presenterchart/presenterchart.pro @@ -4,5 +4,3 @@ TARGET = presenterchart HEADERS += chartview.h SOURCES += main.cpp chartview.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" diff --git a/examples/scatterchart/scatterchart.pro b/examples/scatterchart/scatterchart.pro index f01a490..8170d6f 100644 --- a/examples/scatterchart/scatterchart.pro +++ b/examples/scatterchart/scatterchart.pro @@ -7,5 +7,3 @@ SOURCES += main.cpp \ HEADERS += \ chartview.h - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" diff --git a/examples/scatterinteractions/scatterinteractions.pro b/examples/scatterinteractions/scatterinteractions.pro index b16e10f..596fe02 100644 --- a/examples/scatterinteractions/scatterinteractions.pro +++ b/examples/scatterinteractions/scatterinteractions.pro @@ -7,5 +7,3 @@ SOURCES += main.cpp \ chartview.cpp HEADERS += \ chartview.h - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" diff --git a/examples/splinechart/splinechart.pro b/examples/splinechart/splinechart.pro index 9448891..b2624f5 100644 --- a/examples/splinechart/splinechart.pro +++ b/examples/splinechart/splinechart.pro @@ -3,5 +3,3 @@ } TARGET = splinechart SOURCES += main.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" diff --git a/examples/stackedbarchart/stackedbarchart.pro b/examples/stackedbarchart/stackedbarchart.pro index c9c4280..f6a77b6 100644 --- a/examples/stackedbarchart/stackedbarchart.pro +++ b/examples/stackedbarchart/stackedbarchart.pro @@ -3,5 +3,3 @@ } TARGET = stackedbarchart SOURCES += main.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" diff --git a/examples/stackedbarchartdrilldown/stackedbarchartdrilldown.pro b/examples/stackedbarchartdrilldown/stackedbarchartdrilldown.pro index fd7b235..c10066f 100644 --- a/examples/stackedbarchartdrilldown/stackedbarchartdrilldown.pro +++ b/examples/stackedbarchartdrilldown/stackedbarchartdrilldown.pro @@ -4,5 +4,3 @@ TARGET = stackedbarchartdrilldown SOURCES += main.cpp drilldownseries.cpp drilldownchart.cpp HEADERS += drilldownseries.h drilldownchart.h - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" diff --git a/examples/zoomlinechart/zoomlinechart.pro b/examples/zoomlinechart/zoomlinechart.pro index 92a294f..c98161b 100644 --- a/examples/zoomlinechart/zoomlinechart.pro +++ b/examples/zoomlinechart/zoomlinechart.pro @@ -5,5 +5,3 @@ TARGET = zoomlinechart HEADERS += chart.h chartview.h SOURCES += main.cpp chart.cpp chartview.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_EXAMPLES_BIN_DIR" diff --git a/plugins/declarative/declarative.pro b/plugins/declarative/declarative.pro index 73cc447..c2e8fee 100644 --- a/plugins/declarative/declarative.pro +++ b/plugins/declarative/declarative.pro @@ -42,4 +42,3 @@ INSTALLS += target qmldir FILE = $$PWD/qmldir win32:{FILE = $$replace(FILE, "/","\\")} QMAKE_POST_LINK += $$QMAKE_COPY $$FILE $$CHART_BUILD_PLUGIN_DIR -!system_build:mac: QMAKE_POST_LINK += " & $$MAC_POST_LINK_PREFIX $$MAC_PLUGINS_BIN_DIR" diff --git a/src/src.pro b/src/src.pro index 565ba01..068f521 100644 --- a/src/src.pro +++ b/src/src.pro @@ -166,6 +166,13 @@ win32:{ target.path=$$[QT_INSTALL_LIBS] INSTALLS += target } + +mac: { + # Update the name (id) of the library on OSX to point to the lib dir + MAC_CHARTS_LIB_NAME = "lib"$$LIBRARY_NAME".1.dylib" + QMAKE_POST_LINK += "install_name_tool -id $$CHART_BUILD_LIB_DIR"/"$$MAC_CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$MAC_CHARTS_LIB_NAME" +} + ################################ DEVELOPMENT BUILD ########################################## # There is a problem with jom.exe currently. It does not seem to understand QMAKE_EXTRA_TARGETS properly. # This is the case at least with shadow builds. diff --git a/tests/auto/chartdataset/chartdataset.pro b/tests/auto/chartdataset/chartdataset.pro index 5449ad0..9a7880d 100644 --- a/tests/auto/chartdataset/chartdataset.pro +++ b/tests/auto/chartdataset/chartdataset.pro @@ -3,5 +3,3 @@ } SOURCES += tst_chartdataset.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR" diff --git a/tests/auto/domain/domain.pro b/tests/auto/domain/domain.pro index 204e1ed..267f83a 100644 --- a/tests/auto/domain/domain.pro +++ b/tests/auto/domain/domain.pro @@ -2,5 +2,3 @@ error( "Couldn't find the auto.pri file!" ) } SOURCES += tst_domain.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR" diff --git a/tests/auto/qbarmodelmapper/qbarmodelmapper.pro b/tests/auto/qbarmodelmapper/qbarmodelmapper.pro index 6041c8f..6a15bc6 100644 --- a/tests/auto/qbarmodelmapper/qbarmodelmapper.pro +++ b/tests/auto/qbarmodelmapper/qbarmodelmapper.pro @@ -4,5 +4,3 @@ SOURCES += \ tst_qbarmodelmapper.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR" diff --git a/tests/auto/qbarseries/qbarseries.pro b/tests/auto/qbarseries/qbarseries.pro index 508e8a9..ec5d64c 100644 --- a/tests/auto/qbarseries/qbarseries.pro +++ b/tests/auto/qbarseries/qbarseries.pro @@ -2,5 +2,3 @@ error( "Couldn't find the auto.pri file!" ) } SOURCES += tst_qbarseries.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR" diff --git a/tests/auto/qbarset/qbarset.pro b/tests/auto/qbarset/qbarset.pro index d312d22..2436301 100644 --- a/tests/auto/qbarset/qbarset.pro +++ b/tests/auto/qbarset/qbarset.pro @@ -2,5 +2,3 @@ error( "Couldn't find the auto.pri file!" ) } SOURCES += tst_qbarset.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR" diff --git a/tests/auto/qchart/qchart.pro b/tests/auto/qchart/qchart.pro index b5bca30..53f6737 100644 --- a/tests/auto/qchart/qchart.pro +++ b/tests/auto/qchart/qchart.pro @@ -2,5 +2,3 @@ error( "Couldn't find the auto.pri file!" ) } SOURCES += tst_qchart.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR" diff --git a/tests/auto/qchartview/qchartview.pro b/tests/auto/qchartview/qchartview.pro index 8bcf554..1cc04db 100644 --- a/tests/auto/qchartview/qchartview.pro +++ b/tests/auto/qchartview/qchartview.pro @@ -2,5 +2,3 @@ error( "Couldn't find the auto.pri file!" ) } SOURCES += tst_qchartview.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR" diff --git a/tests/auto/qgroupedbarseries/qgroupedbarseries.pro b/tests/auto/qgroupedbarseries/qgroupedbarseries.pro index bbb8f49..7a29c19 100644 --- a/tests/auto/qgroupedbarseries/qgroupedbarseries.pro +++ b/tests/auto/qgroupedbarseries/qgroupedbarseries.pro @@ -2,5 +2,3 @@ error( "Couldn't find the auto.pri file!" ) } SOURCES += tst_qgroupedbarseries.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR" diff --git a/tests/auto/qlineseries/qlineseries.pro b/tests/auto/qlineseries/qlineseries.pro index 14f85d2..855812e 100644 --- a/tests/auto/qlineseries/qlineseries.pro +++ b/tests/auto/qlineseries/qlineseries.pro @@ -3,5 +3,3 @@ } HEADERS += ../qxyseries/tst_qxyseries.h SOURCES += tst_qlineseries.cpp ../qxyseries/tst_qxyseries.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR" diff --git a/tests/auto/qpercentbarseries/qpercentbarseries.pro b/tests/auto/qpercentbarseries/qpercentbarseries.pro index 64f9b4b..e32360e 100644 --- a/tests/auto/qpercentbarseries/qpercentbarseries.pro +++ b/tests/auto/qpercentbarseries/qpercentbarseries.pro @@ -2,5 +2,3 @@ error( "Couldn't find the auto.pri file!" ) } SOURCES += tst_qpercentbarseries.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR" diff --git a/tests/auto/qpiemodelmapper/qpiemodelmapper.pro b/tests/auto/qpiemodelmapper/qpiemodelmapper.pro index 3a3995e..e03e230 100644 --- a/tests/auto/qpiemodelmapper/qpiemodelmapper.pro +++ b/tests/auto/qpiemodelmapper/qpiemodelmapper.pro @@ -4,5 +4,3 @@ SOURCES += \ tst_qpiemodelmapper.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR" diff --git a/tests/auto/qpieseries/qpieseries.pro b/tests/auto/qpieseries/qpieseries.pro index eebc7a0..82a19f9 100644 --- a/tests/auto/qpieseries/qpieseries.pro +++ b/tests/auto/qpieseries/qpieseries.pro @@ -2,5 +2,3 @@ error( "Couldn't find the auto.pri file!" ) } SOURCES += tst_qpieseries.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR" diff --git a/tests/auto/qpieslice/qpieslice.pro b/tests/auto/qpieslice/qpieslice.pro index 92acdbe..3c8c5a0 100644 --- a/tests/auto/qpieslice/qpieslice.pro +++ b/tests/auto/qpieslice/qpieslice.pro @@ -2,5 +2,3 @@ error( "Couldn't find the auto.pri file!" ) } SOURCES += tst_qpieslice.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR" diff --git a/tests/auto/qscatterseries/qscatterseries.pro b/tests/auto/qscatterseries/qscatterseries.pro index 2426a1d..8144798 100644 --- a/tests/auto/qscatterseries/qscatterseries.pro +++ b/tests/auto/qscatterseries/qscatterseries.pro @@ -2,5 +2,3 @@ HEADERS += ../qxyseries/tst_qxyseries.h SOURCES += tst_qscatterseries.cpp ../qxyseries/tst_qxyseries.cpp - -!system_build:mac:QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR" diff --git a/tests/auto/qsplineseries/qsplineseries.pro b/tests/auto/qsplineseries/qsplineseries.pro index bc1f9d8..7d5d179 100644 --- a/tests/auto/qsplineseries/qsplineseries.pro +++ b/tests/auto/qsplineseries/qsplineseries.pro @@ -3,5 +3,3 @@ } HEADERS += ../qxyseries/tst_qxyseries.h SOURCES += tst_qsplineseries.cpp ../qxyseries/tst_qxyseries.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR" diff --git a/tests/auto/qstackedbarseries/qstackedbarseries.pro b/tests/auto/qstackedbarseries/qstackedbarseries.pro index a3d9c51..0852d15 100644 --- a/tests/auto/qstackedbarseries/qstackedbarseries.pro +++ b/tests/auto/qstackedbarseries/qstackedbarseries.pro @@ -2,5 +2,3 @@ error( "Couldn't find the auto.pri file!" ) } SOURCES += tst_qstackedbarseries.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR" diff --git a/tests/auto/qxymodelmapper/qxymodelmapper.pro b/tests/auto/qxymodelmapper/qxymodelmapper.pro index 24c7c25..4b3647a 100644 --- a/tests/auto/qxymodelmapper/qxymodelmapper.pro +++ b/tests/auto/qxymodelmapper/qxymodelmapper.pro @@ -4,5 +4,3 @@ SOURCES += \ tst_qxymodelmapper.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR" diff --git a/tests/chartwidgettest/chartwidgettest.pro b/tests/chartwidgettest/chartwidgettest.pro index 4531c56..224f503 100644 --- a/tests/chartwidgettest/chartwidgettest.pro +++ b/tests/chartwidgettest/chartwidgettest.pro @@ -16,5 +16,3 @@ SOURCES += main.cpp \ HEADERS += \ mainwidget.h \ dataseriedialog.h - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_TESTS_BIN_DIR" diff --git a/tests/qmlchartproperties/qmlchartproperties.pro b/tests/qmlchartproperties/qmlchartproperties.pro index d7871c6..fccb2d4 100644 --- a/tests/qmlchartproperties/qmlchartproperties.pro +++ b/tests/qmlchartproperties/qmlchartproperties.pro @@ -6,5 +6,3 @@ RESOURCES += resources.qrc SOURCES += main.cpp include(qmlapplicationviewer/qmlapplicationviewer.pri) - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_DEMOS_BIN_DIR" diff --git a/tests/wavechart/wavechart.pro b/tests/wavechart/wavechart.pro index b89e19d..aed0c39 100644 --- a/tests/wavechart/wavechart.pro +++ b/tests/wavechart/wavechart.pro @@ -5,5 +5,3 @@ QT+=opengl TARGET = wavechart SOURCES += main.cpp wavechart.cpp HEADERS += wavechart.h - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_TESTS_BIN_DIR"