diff --git a/console_common.pri b/console_common.pri index 786ad4def..9937ae5d0 100644 --- a/console_common.pri +++ b/console_common.pri @@ -19,5 +19,5 @@ contains(QMAKE_CXX, cl) { } CONFIG(release, debug|release) { - DEFINES += NDEBUG + DEFINES += NDEBUG } diff --git a/externals/tinyxml/tinyxml.pri b/externals/tinyxml/tinyxml.pri index 8e247f3be..8c456a52a 100644 --- a/externals/tinyxml/tinyxml.pri +++ b/externals/tinyxml/tinyxml.pri @@ -1,4 +1,3 @@ - HEADERS += $${BASEPATH}tinystr.h \ $${BASEPATH}tinyxml.h SOURCES += $${BASEPATH}tinystr.cpp \ diff --git a/gui/gui.pro b/gui/gui.pro index 398c66bab..9f2e27229 100644 --- a/gui/gui.pro +++ b/gui/gui.pro @@ -137,5 +137,3 @@ win32 { HEADERS += ../cli/resource.h LIBS += -lshlwapi } - - diff --git a/gui/test/benchmark/common.pri b/gui/test/benchmark/common.pri index b5900102b..c9d10ca66 100644 --- a/gui/test/benchmark/common.pri +++ b/gui/test/benchmark/common.pri @@ -7,4 +7,3 @@ INCLUDEPATH += ../../../externals BASEPATH = ../../../../lib/ include($$PWD/../../../lib/lib.pri) - diff --git a/gui/test/xmlreport/xmlreport.pro b/gui/test/xmlreport/xmlreport.pro index e1e428784..6e1bcc4a6 100644 --- a/gui/test/xmlreport/xmlreport.pro +++ b/gui/test/xmlreport/xmlreport.pro @@ -5,10 +5,10 @@ INCLUDEPATH += . OBJECTS_DIR = ../build MOC_DIR = ../build -DEFINES += SRCDIR=\\\"$$PWD\\\" - include(../common.pri) +DEFINES += SRCDIR=\\\"$$PWD\\\" + # tests SOURCES += testxmlreport.cpp diff --git a/gui/test/xmlreportv1/xmlreportv1.pro b/gui/test/xmlreportv1/xmlreportv1.pro index 8563985e2..e5a7bcbe9 100644 --- a/gui/test/xmlreportv1/xmlreportv1.pro +++ b/gui/test/xmlreportv1/xmlreportv1.pro @@ -5,10 +5,10 @@ INCLUDEPATH += . OBJECTS_DIR = ../build MOC_DIR = ../build -DEFINES += SRCDIR=\\\"$$PWD\\\" - include(../common.pri) +DEFINES += SRCDIR=\\\"$$PWD\\\" + # tests SOURCES += testxmlreportv1.cpp diff --git a/lib/pcrerules.pri b/lib/pcrerules.pri index 22b43ec54..267b54ab3 100644 --- a/lib/pcrerules.pri +++ b/lib/pcrerules.pri @@ -1,13 +1,13 @@ # If HAVE_RULES=yes is passed to qmake, use PCRE and enable rules contains(HAVE_RULES, [yY][eE][sS]) { - CONFIG += use_pcre_rules + CONFIG += use_pcre_rules } use_pcre_rules { - DEFINES += HAVE_RULES - LIBS += -L../externals -lpcre - INCLUDEPATH += ../externals - message("Rules enabled - to disable them and remove the dependency on PCRE, pass HAVE_RULES=no to qmake.") + DEFINES += HAVE_RULES + LIBS += -L../externals -lpcre + INCLUDEPATH += ../externals + message("Rules enabled - to disable them and remove the dependency on PCRE, pass HAVE_RULES=no to qmake.") } else { - message("Rules disabled - to enable them, make PCRE available and pass HAVE_RULES=yes to qmake.") + message("Rules disabled - to enable them, make PCRE available and pass HAVE_RULES=yes to qmake.") } diff --git a/test/test.pro b/test/test.pro index 0c725f7e9..cdc0844f5 100644 --- a/test/test.pro +++ b/test/test.pro @@ -1,4 +1,3 @@ - TEMPLATE = app TARGET = testrunner DEPENDPATH += .