From b516ceb8e187f197feba961e51bde4f770fc8950 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 24 Oct 2015 14:13:59 +0300 Subject: [PATCH] "CONFIG += silent" doesn't work correct with msvc. Do not create target "make distclean" with msvc. --HG-- branch : develop --- src/app/tape/tape.pro | 4 ++-- src/app/valentina/valentina.pro | 4 ++-- src/libs/ifc/ifc.pro | 2 +- src/libs/qmuparser/qmuparser.pro | 2 +- src/libs/vformat/vformat.pro | 2 +- src/libs/vgeometry/vgeometry.pro | 2 +- src/libs/vlayout/vlayout.pro | 2 +- src/libs/vmisc/vmisc.pro | 2 +- src/libs/vobj/vobj.pro | 2 +- src/libs/vpatterndb/vpatterndb.pro | 2 +- src/libs/vpropertyexplorer/vpropertyexplorer.pro | 2 +- src/libs/vtools/vtools.pro | 2 +- src/libs/vwidgets/vwidgets.pro | 2 +- src/test/ParserTest/ParserTest.pro | 2 +- src/test/ValentinaTest/ValentinaTest.pro | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro index 9efd42537..61484bc3a 100644 --- a/src/app/tape/tape.pro +++ b/src/app/tape/tape.pro @@ -121,7 +121,7 @@ CONFIG(debug, debug|release){ DEFINES += "BUILD_REVISION=\\\"unknown\\\"" }else{ # Release mode - CONFIG += silent + !win32-msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*-g++{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll @@ -391,7 +391,7 @@ noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols QMAKE_POST_LINK += objcopy --add-gnu-debuglink="${TARGET}.dbg" ${TARGET} } - !macx{ + !macx:!win32-msvc*{ QMAKE_DISTCLEAN += bin/${TARGET}.dbg } } diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index d68dba277..6e3c5dff8 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -126,7 +126,7 @@ CONFIG(debug, debug|release){ DEFINES += "BUILD_REVISION=\\\"unknown\\\"" }else{ # Release mode - CONFIG += silent + !win32-msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*-g++{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll @@ -2218,7 +2218,7 @@ noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols QMAKE_POST_LINK += objcopy --add-gnu-debuglink="${TARGET}.dbg" ${TARGET} } - !macx{ + !macx:!win32-msvc*{ QMAKE_DISTCLEAN += bin/${TARGET}.dbg } } diff --git a/src/libs/ifc/ifc.pro b/src/libs/ifc/ifc.pro index 566ea8504..34cde58e8 100644 --- a/src/libs/ifc/ifc.pro +++ b/src/libs/ifc/ifc.pro @@ -104,7 +104,7 @@ CONFIG(debug, debug|release){ }else{ # Release mode - CONFIG += silent + !win32-msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*-g++{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/qmuparser/qmuparser.pro b/src/libs/qmuparser/qmuparser.pro index 0d6dfe669..ae73947dc 100644 --- a/src/libs/qmuparser/qmuparser.pro +++ b/src/libs/qmuparser/qmuparser.pro @@ -104,7 +104,7 @@ CONFIG(debug, debug|release){ }else{ # Release mode - CONFIG += silent + !win32-msvc*:CONFIG += silent !unix:*-g++{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vformat/vformat.pro b/src/libs/vformat/vformat.pro index d5d6b2197..a15b528fc 100644 --- a/src/libs/vformat/vformat.pro +++ b/src/libs/vformat/vformat.pro @@ -88,7 +88,7 @@ CONFIG(debug, debug|release){ }else{ # Release mode - CONFIG += silent + !win32-msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*-g++{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vgeometry/vgeometry.pro b/src/libs/vgeometry/vgeometry.pro index 95d49a205..05ee6a629 100644 --- a/src/libs/vgeometry/vgeometry.pro +++ b/src/libs/vgeometry/vgeometry.pro @@ -82,7 +82,7 @@ CONFIG(debug, debug|release){ }else{ # Release mode - CONFIG += silent + !win32-msvc*:CONFIG += silent !unix:*-g++{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vlayout/vlayout.pro b/src/libs/vlayout/vlayout.pro index 3a5af515a..3daacee7c 100644 --- a/src/libs/vlayout/vlayout.pro +++ b/src/libs/vlayout/vlayout.pro @@ -96,7 +96,7 @@ CONFIG(debug, debug|release){ }else{ # Release mode - CONFIG += silent + !win32-msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*-g++{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vmisc/vmisc.pro b/src/libs/vmisc/vmisc.pro index 3c22a91e2..5bb3e4bc4 100644 --- a/src/libs/vmisc/vmisc.pro +++ b/src/libs/vmisc/vmisc.pro @@ -99,7 +99,7 @@ CONFIG(debug, debug|release){ DEFINES += "BUILD_REVISION=\\\"unknown\\\"" }else{ # Release mode - CONFIG += silent + !win32-msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*-g++{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vobj/vobj.pro b/src/libs/vobj/vobj.pro index 73ba1f377..62d9595e1 100644 --- a/src/libs/vobj/vobj.pro +++ b/src/libs/vobj/vobj.pro @@ -82,7 +82,7 @@ CONFIG(debug, debug|release){ }else{ # Release mode - CONFIG += silent + !win32-msvc*:CONFIG += silent !unix:*-g++{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vpatterndb/vpatterndb.pro b/src/libs/vpatterndb/vpatterndb.pro index 30a742b9a..f560bbec6 100644 --- a/src/libs/vpatterndb/vpatterndb.pro +++ b/src/libs/vpatterndb/vpatterndb.pro @@ -85,7 +85,7 @@ CONFIG(debug, debug|release){ }else{ # Release mode - CONFIG += silent + !win32-msvc*:CONFIG += silent !unix:*-g++{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vpropertyexplorer/vpropertyexplorer.pro b/src/libs/vpropertyexplorer/vpropertyexplorer.pro index 7606dda1c..f471efb0f 100644 --- a/src/libs/vpropertyexplorer/vpropertyexplorer.pro +++ b/src/libs/vpropertyexplorer/vpropertyexplorer.pro @@ -113,7 +113,7 @@ CONFIG(debug, debug|release){ }else{ # Release mode - CONFIG += silent + !win32-msvc*:CONFIG += silent !unix:*-g++{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vtools/vtools.pro b/src/libs/vtools/vtools.pro index 9c7937300..53ed935a5 100644 --- a/src/libs/vtools/vtools.pro +++ b/src/libs/vtools/vtools.pro @@ -100,7 +100,7 @@ CONFIG(debug, debug|release){ }else{ # Release mode - CONFIG += silent + !win32-msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*-g++{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vwidgets/vwidgets.pro b/src/libs/vwidgets/vwidgets.pro index 1f1210fc8..83210ebe3 100644 --- a/src/libs/vwidgets/vwidgets.pro +++ b/src/libs/vwidgets/vwidgets.pro @@ -89,7 +89,7 @@ CONFIG(debug, debug|release){ }else{ # Release mode - CONFIG += silent + !win32-msvc*:CONFIG += silent !unix:*-g++{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/test/ParserTest/ParserTest.pro b/src/test/ParserTest/ParserTest.pro index afb6d57b9..1e3b745af 100644 --- a/src/test/ParserTest/ParserTest.pro +++ b/src/test/ParserTest/ParserTest.pro @@ -85,7 +85,7 @@ CONFIG(debug, debug|release){ }else{ # Release mode - CONFIG += silent + !win32-msvc*:CONFIG += silent DEFINES += QT_NO_DEBUG_OUTPUT noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols diff --git a/src/test/ValentinaTest/ValentinaTest.pro b/src/test/ValentinaTest/ValentinaTest.pro index 5df9fa8f0..fbc073f9a 100644 --- a/src/test/ValentinaTest/ValentinaTest.pro +++ b/src/test/ValentinaTest/ValentinaTest.pro @@ -117,7 +117,7 @@ CONFIG(debug, debug|release){ } }else{ # Release mode - CONFIG += silent + !win32-msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*-g++{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll