diff --git a/demos/chartthemes/chartthemes.pro b/demos/chartthemes/chartthemes.pro
index 8905019..ff1589a 100644
--- a/demos/chartthemes/chartthemes.pro
+++ b/demos/chartthemes/chartthemes.pro
@@ -9,4 +9,4 @@ HEADERS = themewidget.h
 #    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"
diff --git a/demos/dynamicspline/dynamicspline.pro b/demos/dynamicspline/dynamicspline.pro
index 0ef9ee3..18da920 100644
--- a/demos/dynamicspline/dynamicspline.pro
+++ b/demos/dynamicspline/dynamicspline.pro
@@ -3,4 +3,4 @@ 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"
diff --git a/demos/piechartcustomization/piechartcustomization.pro b/demos/piechartcustomization/piechartcustomization.pro
index d27161e..935119c 100644
--- a/demos/piechartcustomization/piechartcustomization.pro
+++ b/demos/piechartcustomization/piechartcustomization.pro
@@ -14,5 +14,5 @@ HEADERS += \
     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"
 
diff --git a/demos/qmlchart/qmlchart.pro b/demos/qmlchart/qmlchart.pro
index 9d9eb92..8752f72 100644
--- a/demos/qmlchart/qmlchart.pro
+++ b/demos/qmlchart/qmlchart.pro
@@ -7,4 +7,4 @@ 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"
diff --git a/examples/areachart/areachart.pro b/examples/areachart/areachart.pro
index 3b2b645..2818f3a 100644
--- a/examples/areachart/areachart.pro
+++ b/examples/areachart/areachart.pro
@@ -4,4 +4,4 @@
 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"
diff --git a/examples/barchart/barchart.pro b/examples/barchart/barchart.pro
index fe27548..9bd4750 100644
--- a/examples/barchart/barchart.pro
+++ b/examples/barchart/barchart.pro
@@ -5,4 +5,4 @@
 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"
diff --git a/examples/customchart/customchart.pro b/examples/customchart/customchart.pro
index 25ebca2..715bc9d 100644
--- a/examples/customchart/customchart.pro
+++ b/examples/customchart/customchart.pro
@@ -5,4 +5,4 @@
 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"
diff --git a/examples/linechart/linechart.pro b/examples/linechart/linechart.pro
index 63fed0d..aac30d6 100644
--- a/examples/linechart/linechart.pro
+++ b/examples/linechart/linechart.pro
@@ -4,4 +4,4 @@
 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"
diff --git a/examples/modeldata/modeldata.pro b/examples/modeldata/modeldata.pro
index d110707..bd72052 100644
--- a/examples/modeldata/modeldata.pro
+++ b/examples/modeldata/modeldata.pro
@@ -15,4 +15,4 @@ SOURCES += main.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"
diff --git a/examples/percentbarchart/percentbarchart.pro b/examples/percentbarchart/percentbarchart.pro
index 3a68244..d45642d 100644
--- a/examples/percentbarchart/percentbarchart.pro
+++ b/examples/percentbarchart/percentbarchart.pro
@@ -5,4 +5,4 @@
 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"
diff --git a/examples/piechart/piechart.pro b/examples/piechart/piechart.pro
index 86becd8..14ac2dd 100644
--- a/examples/piechart/piechart.pro
+++ b/examples/piechart/piechart.pro
@@ -4,4 +4,4 @@
 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"
diff --git a/examples/piechartdrilldown/piechartdrilldown.pro b/examples/piechartdrilldown/piechartdrilldown.pro
index 1b39044..adbbf87 100644
--- a/examples/piechartdrilldown/piechartdrilldown.pro
+++ b/examples/piechartdrilldown/piechartdrilldown.pro
@@ -10,4 +10,4 @@ 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"
diff --git a/examples/presenterchart/presenterchart.pro b/examples/presenterchart/presenterchart.pro
index 8e9469f..f28b4fd 100644
--- a/examples/presenterchart/presenterchart.pro
+++ b/examples/presenterchart/presenterchart.pro
@@ -5,4 +5,4 @@ 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"
diff --git a/examples/scatterchart/scatterchart.pro b/examples/scatterchart/scatterchart.pro
index f9683be..16f0cfb 100644
--- a/examples/scatterchart/scatterchart.pro
+++ b/examples/scatterchart/scatterchart.pro
@@ -8,4 +8,4 @@ SOURCES += main.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"
diff --git a/examples/scatterinteractions/scatterinteractions.pro b/examples/scatterinteractions/scatterinteractions.pro
index b8b168d..f8187a4 100644
--- a/examples/scatterinteractions/scatterinteractions.pro
+++ b/examples/scatterinteractions/scatterinteractions.pro
@@ -8,4 +8,4 @@ SOURCES += main.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"
diff --git a/examples/splinechart/splinechart.pro b/examples/splinechart/splinechart.pro
index 3ba5fc6..6a9cc6c 100644
--- a/examples/splinechart/splinechart.pro
+++ b/examples/splinechart/splinechart.pro
@@ -4,4 +4,4 @@
 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"
diff --git a/examples/stackedbarchart/stackedbarchart.pro b/examples/stackedbarchart/stackedbarchart.pro
index 31d0423..9ebcb1e 100644
--- a/examples/stackedbarchart/stackedbarchart.pro
+++ b/examples/stackedbarchart/stackedbarchart.pro
@@ -4,4 +4,4 @@
 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"
diff --git a/examples/stackedbarchartdrilldown/stackedbarchartdrilldown.pro b/examples/stackedbarchartdrilldown/stackedbarchartdrilldown.pro
index aed1ecd..4fbf9fa 100644
--- a/examples/stackedbarchartdrilldown/stackedbarchartdrilldown.pro
+++ b/examples/stackedbarchartdrilldown/stackedbarchartdrilldown.pro
@@ -5,4 +5,4 @@ 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"
diff --git a/examples/zoomlinechart/zoomlinechart.pro b/examples/zoomlinechart/zoomlinechart.pro
index e30ec2f..120c391 100644
--- a/examples/zoomlinechart/zoomlinechart.pro
+++ b/examples/zoomlinechart/zoomlinechart.pro
@@ -5,4 +5,4 @@ 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"
diff --git a/qmlplugin/qmlplugin.pro b/qmlplugin/qmlplugin.pro
index a6a7382..ad4c60f 100644
--- a/qmlplugin/qmlplugin.pro
+++ b/qmlplugin/qmlplugin.pro
@@ -1,4 +1,3 @@
-CURRENTLY_BUILDING_COMPONENTS = "qmlplugin"
 TEMPLATE = lib
 TARGET = qtcommercialchartqml
 CONFIG += qt plugin
@@ -50,4 +49,4 @@ 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"
diff --git a/test/auto/chartdataset/chartdataset.pro b/test/auto/chartdataset/chartdataset.pro
index 4a8f6f7..c16cf62 100644
--- a/test/auto/chartdataset/chartdataset.pro
+++ b/test/auto/chartdataset/chartdataset.pro
@@ -4,4 +4,4 @@
 
 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"
diff --git a/test/auto/domain/domain.pro b/test/auto/domain/domain.pro
index 0536b13..1afa4c7 100644
--- a/test/auto/domain/domain.pro
+++ b/test/auto/domain/domain.pro
@@ -3,4 +3,4 @@
 }
 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"
diff --git a/test/auto/qchart/qchart.pro b/test/auto/qchart/qchart.pro
index 663a4c3..49509c6 100644
--- a/test/auto/qchart/qchart.pro
+++ b/test/auto/qchart/qchart.pro
@@ -3,4 +3,4 @@
 }
 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"
diff --git a/test/auto/qchartview/qchartview.pro b/test/auto/qchartview/qchartview.pro
index 86b9eaf..8aaab03 100644
--- a/test/auto/qchartview/qchartview.pro
+++ b/test/auto/qchartview/qchartview.pro
@@ -3,4 +3,4 @@
 }
 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"
diff --git a/test/chartwidgettest/chartwidgettest.pro b/test/chartwidgettest/chartwidgettest.pro
index 93cb7ca..48eb605 100644
--- a/test/chartwidgettest/chartwidgettest.pro
+++ b/test/chartwidgettest/chartwidgettest.pro
@@ -17,4 +17,4 @@ 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"
diff --git a/test/gdpbarchart/gdpbarchart.pro b/test/gdpbarchart/gdpbarchart.pro
index 1a73e0d..f344abf 100644
--- a/test/gdpbarchart/gdpbarchart.pro
+++ b/test/gdpbarchart/gdpbarchart.pro
@@ -17,4 +17,4 @@ HEADERS  += widget.h
     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"
diff --git a/test/tablemodelchart/tablemodelchart.pro b/test/tablemodelchart/tablemodelchart.pro
index 7ff4298..20369ab 100644
--- a/test/tablemodelchart/tablemodelchart.pro
+++ b/test/tablemodelchart/tablemodelchart.pro
@@ -15,4 +15,4 @@ SOURCES += main.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"
diff --git a/test/wavechart/wavechart.pro b/test/wavechart/wavechart.pro
index e49ebbf..da9f74b 100644
--- a/test/wavechart/wavechart.pro
+++ b/test/wavechart/wavechart.pro
@@ -6,4 +6,4 @@ 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"