From 066a31d1c4152f8609f6a7b5e1c51499b1e488ea Mon Sep 17 00:00:00 2001 From: Rodrigo Torres Date: Sun, 10 Sep 2017 00:47:53 -0300 Subject: [PATCH] Define only once --- common.pri | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/common.pri b/common.pri index b99a952..6101c54 100644 --- a/common.pri +++ b/common.pri @@ -1,27 +1,27 @@ -CONFIG += build_translations +CONFIG *= build_translations !contains(CONFIG, no_zint){ - CONFIG += zint + CONFIG *= zint } !contains(CONFIG, qtscriptengine){ - CONFIG += qjsengine + CONFIG *= qjsengine } !contains(CONFIG, no_formdesigner){ - CONFIG += dialogdesigner + CONFIG *= dialogdesigner } ZINT_PATH = $$PWD/3rdparty/zint-2.6.1 contains(CONFIG,zint){ - DEFINES += HAVE_ZINT + DEFINES *= HAVE_ZINT } greaterThan(QT_MAJOR_VERSION, 4) { - QT += uitools + QT *= uitools } lessThan(QT_MAJOR_VERSION, 5){ - CONFIG += uitools + CONFIG *= uitools } CONFIG(release, debug|release){ @@ -73,30 +73,30 @@ LIMEREPORT_VERSION_MINOR = 4 LIMEREPORT_VERSION_RELEASE = 40 LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}' -DEFINES += LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\" +DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\" -QT += script xml sql +QT *= script xml sql REPORT_PATH = $$PWD/limereport TRANSLATIONS_PATH = $$PWD/translations greaterThan(QT_MAJOR_VERSION, 4) { - DEFINES+=HAVE_QT5 - QT+= printsupport widgets qml + DEFINES *= HAVE_QT5 + QT *= printsupport widgets qml contains(QT,uitools){ message(uitools) - DEFINES += HAVE_UI_LOADER + DEFINES *= HAVE_UI_LOADER } contains(CONFIG, qjsengine){ message(qjsengine) - DEFINES += USE_QJSENGINE + DEFINES *= USE_QJSENGINE } } lessThan(QT_MAJOR_VERSION, 5){ - DEFINES+=HAVE_QT4 + DEFINES *= HAVE_QT4 CONFIG(uitools){ message(uitools) - DEFINES += HAVE_UI_LOADER + DEFINES *= HAVE_UI_LOADER } }