Simplify .pro/.pri

2025-09-23 08:39:07 +03:00 · 2021-08-18 14:14:37 -03:00
parent d56fb6150c
commit e96e1a9adc
13 changed files with 235 additions and 240 deletions
--- a/limereport/designer.pri
+++ b/limereport/designer.pri
@@ -1,8 +1,9 @@
 include(../common.pri)
-DEFINES+=HAVE_REPORT_DESIGNER

-contains(CONFIG,dialogdesigner){
-	include($$REPORT_PATH/dialogdesigner/dialogdesigner.pri)
+DEFINES += HAVE_REPORT_DESIGNER
+
+CONFIG(dialogdesigner) {
+    include($$REPORT_PATH/dialogdesigner/dialogdesigner.pri)
 }

 INCLUDEPATH += $$REPORT_PATH/objectinspector \
@@ -51,7 +52,7 @@ SOURCES += \
    $$REPORT_PATH/lrreportdesignwidget.cpp \
    $$REPORT_PATH/lrreportdesignwindow.cpp

-contains(CONFIG, svg){
+CONFIG(svg) {
    SOURCES += \
        $$REPORT_PATH/objectinspector/editors/lrsvgeditor.cpp \
        $$REPORT_PATH/objectinspector/propertyItems/lrsvgpropitem.cpp
@@ -100,7 +101,7 @@ HEADERS += \
    $$REPORT_PATH/lrreportdesignwidget.h \
    $$REPORT_PATH/lrreportdesignwindow.h

-contains(CONFIG, svg){
+contains(CONFIG, svg) {
    HEADERS += \
        $$REPORT_PATH/objectinspector/editors/lrsvgeditor.h \
        $$REPORT_PATH/objectinspector/propertyItems/lrsvgpropitem.h
--- a/limereport/dialogdesigner/3rdparty/qtcreator/designerintegrationv2/designerintegration.pri
+++ b/limereport/dialogdesigner/3rdparty/qtcreator/designerintegrationv2/designerintegration.pri
@@ -1,11 +1,11 @@
 INCLUDEPATH *= $$PWD $$PWD/..

 SOURCES += $$PWD/widgethost.cpp \
-    $$PWD/sizehandlerect.cpp \
-    $$PWD/formresizer.cpp
+           $$PWD/sizehandlerect.cpp \
+           $$PWD/formresizer.cpp

 HEADERS += $$PWD/widgethost.h \
-    $$PWD/sizehandlerect.h \
-    $$PWD/formresizer.h \
-    $$PWD/widgethostconstants.h \
-    $$PWD/../namespace_global.h
+           $$PWD/sizehandlerect.h \
+           $$PWD/formresizer.h \
+           $$PWD/widgethostconstants.h \
+           $$PWD/../namespace_global.h
--- a/limereport/dialogdesigner/dialogdesigner.pri
+++ b/limereport/dialogdesigner/dialogdesigner.pri
@@ -1,27 +1,25 @@
 include(../../common.pri)
 include($$PWD/3rdparty/qtcreator/designerintegrationv2/designerintegration.pri)
+
 INCLUDEPATH *= $$PWD/3rdparty/designer
-greaterThan(QT_MAJOR_VERSION, 4) {
-    contains(QT,uitools){
+
+greaterThan(QT_MAJOR_VERSION, 4) : contains(QT, uitools) {
        DEFINES += HAVE_QTDESIGNER_INTEGRATION
-    }
 }
-lessThan(QT_MAJOR_VERSION, 5){
-    contains(CONFIG,uitools){
+
+lessThan(QT_MAJOR_VERSION, 5) : CONFIG(uitools) {
        DEFINES += HAVE_QTDESIGNER_INTEGRATION
-    }
 }

 greaterThan(QT_MAJOR_VERSION, 4) {
    QT *= designer designercomponents-private
-
 } else {
-    CONFIG  *= designer
-    qtAddLibrary( QtDesignerComponents )
+    CONFIG *= designer
+    qtAddLibrary(QtDesignerComponents)
 }

 SOURCES += $$PWD/lrdialogdesigner.cpp
 HEADERS += $$PWD/lrdialogdesigner.h

 RESOURCES += \
-    $$PWD/dialogdesigner.qrc
+           $$PWD/dialogdesigner.qrc
--- a/limereport/limereport.pri
+++ b/limereport/limereport.pri
@@ -1,6 +1,6 @@
 include(../common.pri)

-contains(CONFIG, embedded_designer){
+contains(CONFIG, embedded_designer) {
    include(designer.pri)
    message(embedded designer)
 }
@@ -76,17 +76,16 @@ SOURCES += \
    $$REPORT_PATH/exporters/lrpdfexporter.cpp \
    $$REPORT_PATH/lrpreparedpages.cpp

-
-contains(CONFIG, staticlib){
+CONFIG(staticlib) {
    SOURCES += $$REPORT_PATH/lrfactoryinitializer.cpp
 }
    
-contains(CONFIG, zint){
+CONFIG(zint) {
    SOURCES += $$REPORT_PATH/items/lrbarcodeitem.cpp
 }

-contains(CONFIG, svg){
-   SOURCES += $$REPORT_PATH/items/lrsvgitem.cpp \
+CONFIG(svg) {
+    SOURCES += $$REPORT_PATH/items/lrsvgitem.cpp \
 }

 HEADERS += \
@@ -171,15 +170,15 @@ HEADERS += \
    $$REPORT_PATH/lrpreparedpages.h \
    $$REPORT_PATH/lrpreparedpagesintf.h 

-contains(CONFIG, staticlib){
+CONFIG(staticlib) {
    HEADERS += $$REPORT_PATH/lrfactoryinitializer.h
 }

-contains(CONFIG,zint){
+CONFIG(zint) {
    HEADERS += $$REPORT_PATH/items/lrbarcodeitem.h
 }

-contains(CONFIG, svg){
+CONFIG(svg) {
    HEADERS += $$REPORT_PATH/items/lrsvgitem.h
 }

@@ -196,4 +195,3 @@ FORMS += \
 RESOURCES += \
    $$REPORT_PATH/report.qrc \
    $$REPORT_PATH/items/items.qrc
-
--- a/limereport/limereport.pro
+++ b/limereport/limereport.pro
@@ -1,4 +1,4 @@
-CONFIG(debug, debug|release){
+CONFIG(debug, debug|release) {
    TARGET = limereportd
 } else {
    TARGET = limereport
@@ -6,11 +6,11 @@ CONFIG(debug, debug|release){

 TEMPLATE = lib

-contains(CONFIG, static_build){
+CONFIG(static_build) {
    CONFIG += staticlib
 }

-!contains(CONFIG, staticlib){
+!CONFIG(staticlib) {
    CONFIG += lib
    CONFIG += dll
 }
@@ -19,14 +19,14 @@ CONFIG += create_prl
 CONFIG += link_prl

 macx{
-    CONFIG  -= dll
-    CONFIG  += lib_bundle
-    CONFIG  += plugin
+    CONFIG -= dll
+    CONFIG += lib_bundle
+    CONFIG += plugin
 }

 DEFINES += LIMEREPORT_EXPORTS

-contains(CONFIG, staticlib){
+CONFIG(staticlib) {
    DEFINES += HAVE_STATIC_BUILD
    DEFINES += QZINT_STATIC_BUILD
    message(STATIC_BUILD)
@@ -47,15 +47,15 @@ EXTRA_FILES += \
 include(limereport.pri)

 unix:{
-    DESTDIR  = $${DEST_LIBS}
+    DESTDIR = $${DEST_LIBS}
    linux{
        QMAKE_POST_LINK += mkdir -p \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t) # qmake need make mkdir -p on subdirs more than root/
-        for(FILE,EXTRA_FILES){
+        for(FILE,EXTRA_FILES) {
            QMAKE_POST_LINK += $$QMAKE_COPY \"$$FILE\" \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t) # inside of libs make /include/files
        }
    }
    macx{
-        for(FILE,EXTRA_FILES){
+        for(FILE,EXTRA_FILES) {
            QMAKE_POST_LINK += $$QMAKE_COPY \"$$FILE\" \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t)
        }
        QMAKE_POST_LINK += mkdir -p \"$${DESTDIR}/include\" $$escape_expand(\\n\\t)
@@ -65,9 +65,9 @@ unix:{

 win32 {
    DESTDIR = $${DEST_LIBS}
-    contains(QMAKE_HOST.os, Linux){
+    contains(QMAKE_HOST.os, Linux) {
        QMAKE_POST_LINK += mkdir -p \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t) # qmake need make mkdir -p on subdirs more than root/
-        for(FILE,EXTRA_FILES){
+        for(FILE,EXTRA_FILES) {
            QMAKE_POST_LINK += $$QMAKE_COPY \"$$FILE\" \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t) # inside of libs make /include/files
        }
        QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$${DEST_INCLUDE_DIR}\" \"$${DESTDIR}\"
@@ -78,23 +78,23 @@ win32 {
 	DEST_DIR ~= s,/,\\,g
 	DEST_INCLUDE_DIR ~= s,/,\\,g

-	for(FILE,EXTRA_FILES){
+        for(FILE,EXTRA_FILES) {
    	    QMAKE_POST_LINK += $$QMAKE_COPY \"$$FILE\" \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t)
 	}
 	QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$${DEST_INCLUDE_DIR}\" \"$${DEST_DIR}\"
    }
 }

-contains(CONFIG,zint){
+CONFIG(zint) {
    message(zint)
    INCLUDEPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt
    DEPENDPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt
-	LIBS += -L$${DEST_LIBS}
-        CONFIG(release, debug|release){
-		LIBS += -lQtZint
-	} else {
-		LIBS += -lQtZintd
-	}
+    LIBS += -L$${DEST_LIBS}
+    CONFIG(release, debug|release) {
+        LIBS += -lQtZint
+    } else {
+        LIBS += -lQtZintd
+    }
 }

 #### Install mkspecs, headers and libs to QT_INSTALL_DIR
@@ -112,7 +112,7 @@ INSTALLS += target

 ####Automatically build required translation files (*.qm)

-contains(CONFIG,build_translations){
+CONFIG(build_translations) {
    LANGUAGES = ru es ar fr zh pl

    defineReplace(prependAll) {
@@ -139,5 +139,3 @@ contains(CONFIG,build_translations){
 }

 #### EN AUTOMATIC TRANSLATIONS
-
-