aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed warning.pri for CollectionTest and TranslationsTest libraries.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-08-06 19:18:25 +03:00
parent 69e0ff74e6
commit 305cbe8acb
4 changed files with 128 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/test/CollectionTest/CollectionTest.pro
View File

@ -50,16 +50,9 @@ HEADERS += \
# Set using ccache. Function enable_ccache() defined in common.pri. # Set using ccache. Function enable_ccache() defined in common.pri.
$$enable_ccache() $$enable_ccache()
CONFIG(debug, debug|release){
# Debug mode
unix {
include(warnings.pri) include(warnings.pri)
} else {
*-g++{ CONFIG(release, debug|release){
QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
}
}
}else{
# Release mode # Release mode
!win32-msvc*:CONFIG += silent !win32-msvc*:CONFIG += silent
DEFINES += V_NO_ASSERT DEFINES += V_NO_ASSERT
@ -67,10 +60,6 @@ CONFIG(debug, debug|release){
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll
} }
checkWarnings{
unix:include(warnings.pri)
}
noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols
# do nothing # do nothing
} else { } else {

18
src/test/CollectionTest/warnings.pri
View File

@ -1,4 +1,5 @@
#Turn on compilers warnings. #Turn on compilers warnings.
unix {
*-g++{ *-g++{
QMAKE_CXXFLAGS += \ QMAKE_CXXFLAGS += \
# Key -isystem disable checking errors in system headers. # Key -isystem disable checking errors in system headers.
@ -47,3 +48,20 @@ clang*{
QMAKE_CXXFLAGS += -Werror QMAKE_CXXFLAGS += -Werror
} }
} }
} else { # Windows
*-g++{
QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
QMAKE_CXXFLAGS += -Werror
}
}
win32-msvc*{
QMAKE_CXXFLAGS += $$MSVC_DEBUG_CXXFLAGS # See common.pri for more details.
checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
QMAKE_CXXFLAGS += -WX
}
}
}

15
src/test/TranslationsTest/TranslationsTest.pro
View File

@ -54,16 +54,9 @@ $$enable_ccache()
DEFINES += TS_DIR=\\\"$${PWD}/../../../share/translations\\\" DEFINES += TS_DIR=\\\"$${PWD}/../../../share/translations\\\"
CONFIG(debug, debug|release){
# Debug mode
unix {
include(warnings.pri) include(warnings.pri)
} else {
*-g++{ CONFIG(release, debug|release){
QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
}
}
}else{
# Release mode # Release mode
!win32-msvc*:CONFIG += silent !win32-msvc*:CONFIG += silent
DEFINES += V_NO_ASSERT DEFINES += V_NO_ASSERT
@ -71,10 +64,6 @@ CONFIG(debug, debug|release){
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll
} }
checkWarnings{
unix:include(warnings.pri)
}
noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols
# do nothing # do nothing
} else { } else {

18
src/test/TranslationsTest/warnings.pri
View File

@ -1,4 +1,5 @@
#Turn on compilers warnings. #Turn on compilers warnings.
unix {
*-g++{ *-g++{
QMAKE_CXXFLAGS += \ QMAKE_CXXFLAGS += \
# Key -isystem disable checking errors in system headers. # Key -isystem disable checking errors in system headers.
@ -47,3 +48,20 @@ clang*{
QMAKE_CXXFLAGS += -Werror QMAKE_CXXFLAGS += -Werror
} }
} }
} else { # Windows
*-g++{
QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
QMAKE_CXXFLAGS += -Werror
}
}
win32-msvc*{
QMAKE_CXXFLAGS += $$MSVC_DEBUG_CXXFLAGS # See common.pri for more details.
checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
QMAKE_CXXFLAGS += -WX
}
}
}