From 1142403857523f29b33d2ed3dc8568ff768849ca 2016-05-19 18:49:54 From: Oswald Buddenhagen Date: 2016-05-19 18:49:54 Subject: [PATCH] don't duplicate functionality from various .prf files Change-Id: If716670266e0f663ee600d11c7601df139825c11 Reviewed-by: Miikka Heikkinen Reviewed-by: Tomi Korpipää --- diff --git a/src/charts/charts.pro b/src/charts/charts.pro index cd43bd2..9b6c7fe 100644 --- a/src/charts/charts.pro +++ b/src/charts/charts.pro @@ -7,8 +7,6 @@ DEFINES += QT_CHARTS_LIBRARY # Fix exports in static builds for applications linking charts module static: MODULE_DEFINES += QT_CHARTS_STATICLIB -MODULE_INCNAME = QtCharts - QMAKE_DOCS = $$PWD/doc/qtcharts.qdocconf QMAKE_TARGET_PRODUCT = "Qt Charts (Qt $$QT_VERSION)" diff --git a/src/chartsqml2/chartsqml2.pro b/src/chartsqml2/chartsqml2.pro index 445513b..56e1c2d 100644 --- a/src/chartsqml2/chartsqml2.pro +++ b/src/chartsqml2/chartsqml2.pro @@ -47,16 +47,9 @@ HEADERS += \ declarativechartnode.h \ declarativerendernode.h -OTHER_FILES = qmldir - load(qml_plugin) win32 { - CONFIG += skip_target_version_ext - VERSION = $$MODULE_VERSION QMAKE_TARGET_PRODUCT = "Qt Charts (Qt $$QT_VERSION)" QMAKE_TARGET_DESCRIPTION = "Charts QML plugin for Qt." } - -QML_FILES += \ - $$PWD/plugins.qmltypes