Code cleanup in *.pro files

App/App.pro

@@ -10,15 +10,12 @@ CONFIG += BORNAGAIN_ROOT # depend on ROOT libraries
 # -----------------------------------------------------------------------------
 # (note, that when Qt libraries are used, it is already done in <qglobal.h>)
 macx {
-    QMAKE_CXXFLAGS_DEBUG += -DQ_OS_MAC
-    QMAKE_CXXFLAGS_RELEASE += -DQ_OS_MAC
+    DEFINES += Q_OS_MAC
 }
 unix:!macx {
-    QMAKE_CXXFLAGS_DEBUG += -DQ_OS_LINUX
-    QMAKE_CXXFLAGS_RELEASE += -DQ_OS_LINUX
+    DEFINES += Q_OS_LINUX
 }
 
-
 FUNCTIONAL_TESTS = $$PWD/../Tests/FunctionalTests/TestCore
 
 # -----------------------------------------------------------------------------
@@ -43,11 +40,6 @@ SOURCES += \
     src/IFunctionalTest.cpp \
     src/IsGISAXSData.cpp \
     src/IsGISAXSTools.cpp \
-#    src/MinimizerFactory.cpp \
-#    src/ROOTGSLNLSMinimizer.cpp \
-#    src/ROOTGSLSimAnMinimizer.cpp \
-#    src/ROOTMinimizer.cpp \
-#    src/ROOTMinimizerHelper.cpp \
     src/SampleFactory.cpp \
     src/StandardSamples.cpp \
     src/TestConvolution.cpp \
@@ -109,12 +101,6 @@ HEADERS += \
     inc/IFunctionalTest.h \
     inc/IsGISAXSData.h \
     inc/IsGISAXSTools.h \
-#    inc/MinimizerFactory.h \
-#    inc/ROOTGSLNLSMinimizer.h \
-#    inc/ROOTGSLSimAnMinimizer.h \
-#    inc/ROOTMinimizer.h \
-#    inc/ROOTMinimizerFunction.h \
-#    inc/ROOTMinimizerHelper.h \
     inc/SampleFactory.h \
     inc/StandardSamples.h \
     inc/TestConvolution.h \

Tests/FunctionalTests/TestCore/IsGISAXS01/IsGISAXS01.pro

@@ -4,8 +4,7 @@ CONFIG  -= qt app_bundle
 QT      -= core gui
 
 include($$PWD/../../../../shared.pri)
-QMAKE_CXXFLAGS_RELEASE += -DSTANDALONE
-QMAKE_CXXFLAGS_DEBUG += -DSTANDALONE
+DEFINES += STANDALONE
 LIBS += $$PWD/../../../../lib/libBornAgainCore.so
 
 SOURCES += IsGISAXS01.cpp

Tests/FunctionalTests/TestCore/IsGISAXS02/IsGISAXS02.pro

@@ -4,8 +4,7 @@ CONFIG  -= qt app_bundle
 QT      -= core gui
 
 include($$PWD/../../../../shared.pri)
-QMAKE_CXXFLAGS_RELEASE += -DSTANDALONE
-QMAKE_CXXFLAGS_DEBUG += -DSTANDALONE
+DEFINES += STANDALONE
 LIBS += $$PWD/../../../../lib/libBornAgainCore.so
 
 SOURCES += IsGISAXS02.cpp

Tests/FunctionalTests/TestCore/IsGISAXS03/IsGISAXS03.pro

@@ -4,8 +4,7 @@ CONFIG  -= qt app_bundle
 QT      -= core gui
 
 include($$PWD/../../../../shared.pri)
-QMAKE_CXXFLAGS_RELEASE += -DSTANDALONE
-QMAKE_CXXFLAGS_DEBUG += -DSTANDALONE
+DEFINES += STANDALONE
 LIBS += $$PWD/../../../../lib/libBornAgainCore.so
 
 SOURCES += IsGISAXS03.cpp

Tests/FunctionalTests/TestCore/IsGISAXS04/IsGISAXS04.pro

@@ -4,8 +4,7 @@ CONFIG  -= qt app_bundle
 QT      -= core gui
 
 include($$PWD/../../../../shared.pri)
-QMAKE_CXXFLAGS_RELEASE += -DSTANDALONE
-QMAKE_CXXFLAGS_DEBUG += -DSTANDALONE
+DEFINES += STANDALONE
 LIBS += $$PWD/../../../../lib/libBornAgainCore.so
 
 SOURCES += IsGISAXS04.cpp

Tests/FunctionalTests/TestCore/IsGISAXS06/IsGISAXS06.pro

@@ -4,8 +4,7 @@ CONFIG  -= qt app_bundle
 QT      -= core gui
 
 include($$PWD/../../../../shared.pri)
-QMAKE_CXXFLAGS_RELEASE += -DSTANDALONE
-QMAKE_CXXFLAGS_DEBUG += -DSTANDALONE
+DEFINES += STANDALONE
 LIBS += $$PWD/../../../../lib/libBornAgainCore.so
 
 SOURCES += IsGISAXS06.cpp

Tests/FunctionalTests/TestCore/IsGISAXS07/IsGISAXS07.pro

@@ -4,8 +4,7 @@ CONFIG  -= qt app_bundle
 QT      -= core gui
 
 include($$PWD/../../../../shared.pri)
-QMAKE_CXXFLAGS_RELEASE += -DSTANDALONE
-QMAKE_CXXFLAGS_DEBUG += -DSTANDALONE
+DEFINES += STANDALONE
 LIBS += $$PWD/../../../../lib/libBornAgainCore.so
 
 SOURCES += IsGISAXS07.cpp

Tests/FunctionalTests/TestCore/IsGISAXS08/IsGISAXS08.pro

@@ -4,8 +4,7 @@ CONFIG  -= qt app_bundle
 QT      -= core gui
 
 include($$PWD/../../../../shared.pri)
-QMAKE_CXXFLAGS_RELEASE += -DSTANDALONE
-QMAKE_CXXFLAGS_DEBUG += -DSTANDALONE
+DEFINES += STANDALONE
 LIBS += $$PWD/../../../../lib/libBornAgainCore.so
 
 SOURCES += IsGISAXS08.cpp

Tests/FunctionalTests/TestCore/IsGISAXS09/IsGISAXS09.pro

@@ -4,8 +4,7 @@ CONFIG  -= qt app_bundle
 QT      -= core gui
 
 include($$PWD/../../../../shared.pri)
-QMAKE_CXXFLAGS_RELEASE += -DSTANDALONE
-QMAKE_CXXFLAGS_DEBUG += -DSTANDALONE
+DEFINES += STANDALONE
 LIBS += $$PWD/../../../../lib/libBornAgainCore.so
 
 SOURCES += IsGISAXS09.cpp

Tests/FunctionalTests/TestCore/IsGISAXS10/IsGISAXS10.pro

@@ -4,8 +4,7 @@ CONFIG  -= qt app_bundle
 QT      -= core gui
 
 include($$PWD/../../../../shared.pri)
-QMAKE_CXXFLAGS_RELEASE += -DSTANDALONE
-QMAKE_CXXFLAGS_DEBUG += -DSTANDALONE
+DEFINES += STANDALONE
 LIBS += $$PWD/../../../../lib/libBornAgainCore.so
 
 SOURCES += IsGISAXS10.cpp

Tests/FunctionalTests/TestCore/IsGISAXS11/IsGISAXS11.pro

@@ -4,8 +4,7 @@ CONFIG  -= qt app_bundle
 QT      -= core gui
 
 include($$PWD/../../../../shared.pri)
-QMAKE_CXXFLAGS_RELEASE += -DSTANDALONE
-QMAKE_CXXFLAGS_DEBUG += -DSTANDALONE
+DEFINES += STANDALONE
 LIBS += $$PWD/../../../../lib/libBornAgainCore.so
 
 SOURCES += IsGISAXS11.cpp

Tests/FunctionalTests/TestCore/IsGISAXS15/IsGISAXS15.pro

@@ -4,8 +4,7 @@ CONFIG  -= qt app_bundle
 QT      -= core gui
 
 include($$PWD/../../../../shared.pri)
-QMAKE_CXXFLAGS_RELEASE += -DSTANDALONE
-QMAKE_CXXFLAGS_DEBUG += -DSTANDALONE
+DEFINES += STANDALONE
 LIBS += $$PWD/../../../../lib/libBornAgainCore.so
 
 SOURCES += IsGISAXS15.cpp