Fixed warning.pri for CollectionTest and TranslationsTest libraries.
--HG-- branch : develop
This commit is contained in:
Roman Telezhynskyi
parent
69e0ff74e6
commit
305cbe8acb
|
|
@ -50,16 +50,9 @@ HEADERS += \
|
|||
# Set using ccache. Function enable_ccache() defined in common.pri.
|
||||
$$enable_ccache()
|
||||
|
||||
CONFIG(debug, debug|release){
|
||||
# Debug mode
|
||||
unix {
|
||||
include(warnings.pri)
|
||||
} else {
|
||||
*-g++{
|
||||
QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
|
||||
}
|
||||
}
|
||||
}else{
|
||||
include(warnings.pri)
|
||||
|
||||
CONFIG(release, debug|release){
|
||||
# Release mode
|
||||
!win32-msvc*:CONFIG += silent
|
||||
DEFINES += V_NO_ASSERT
|
||||
|
|
@ -67,10 +60,6 @@ CONFIG(debug, debug|release){
|
|||
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll
|
||||
}
|
||||
|
||||
checkWarnings{
|
||||
unix:include(warnings.pri)
|
||||
}
|
||||
|
||||
noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols
|
||||
# do nothing
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -1,49 +1,67 @@
|
|||
#Turn on compilers warnings.
|
||||
*-g++{
|
||||
QMAKE_CXXFLAGS += \
|
||||
# Key -isystem disable checking errors in system headers.
|
||||
-isystem "$${OUT_PWD}/$${UI_DIR}" \
|
||||
-isystem "$${OUT_PWD}/$${MOC_DIR}" \
|
||||
-isystem "$${OUT_PWD}/$${RCC_DIR}" \
|
||||
$$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
|
||||
unix {
|
||||
*-g++{
|
||||
QMAKE_CXXFLAGS += \
|
||||
# Key -isystem disable checking errors in system headers.
|
||||
-isystem "$${OUT_PWD}/$${UI_DIR}" \
|
||||
-isystem "$${OUT_PWD}/$${MOC_DIR}" \
|
||||
-isystem "$${OUT_PWD}/$${RCC_DIR}" \
|
||||
$$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
|
||||
|
||||
checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
|
||||
QMAKE_CXXFLAGS += -Werror
|
||||
checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
|
||||
QMAKE_CXXFLAGS += -Werror
|
||||
}
|
||||
|
||||
noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer
|
||||
# do nothing
|
||||
} else {
|
||||
#gcc’s 4.8.0 Address Sanitizer
|
||||
#http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/
|
||||
QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer
|
||||
QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer
|
||||
QMAKE_LFLAGS += -fsanitize=address
|
||||
}
|
||||
}
|
||||
|
||||
noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer
|
||||
# do nothing
|
||||
} else {
|
||||
#gcc’s 4.8.0 Address Sanitizer
|
||||
#http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/
|
||||
QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer
|
||||
QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer
|
||||
QMAKE_LFLAGS += -fsanitize=address
|
||||
}
|
||||
}
|
||||
|
||||
clang*{
|
||||
QMAKE_CXXFLAGS += \
|
||||
# Key -isystem disable checking errors in system headers.
|
||||
-isystem "$${OUT_PWD}/$${UI_DIR}" \
|
||||
-isystem "$${OUT_PWD}/$${MOC_DIR}" \
|
||||
-isystem "$${OUT_PWD}/$${RCC_DIR}" \
|
||||
$$CLANG_DEBUG_CXXFLAGS \ # See common.pri for more details.
|
||||
-Wno-gnu-zero-variadic-macro-arguments\ # See macros QSKIP
|
||||
|
||||
checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
|
||||
QMAKE_CXXFLAGS += -Werror
|
||||
}
|
||||
}
|
||||
|
||||
*-icc-*{
|
||||
QMAKE_CXXFLAGS += \
|
||||
-isystem "$${OUT_PWD}/$${UI_DIR}" \
|
||||
-isystem "$${OUT_PWD}/$${MOC_DIR}" \
|
||||
-isystem "$${OUT_PWD}/$${RCC_DIR}" \
|
||||
$$ICC_DEBUG_CXXFLAGS
|
||||
|
||||
checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
|
||||
QMAKE_CXXFLAGS += -Werror
|
||||
clang*{
|
||||
QMAKE_CXXFLAGS += \
|
||||
# Key -isystem disable checking errors in system headers.
|
||||
-isystem "$${OUT_PWD}/$${UI_DIR}" \
|
||||
-isystem "$${OUT_PWD}/$${MOC_DIR}" \
|
||||
-isystem "$${OUT_PWD}/$${RCC_DIR}" \
|
||||
$$CLANG_DEBUG_CXXFLAGS \ # See common.pri for more details.
|
||||
-Wno-gnu-zero-variadic-macro-arguments\ # See macros QSKIP
|
||||
|
||||
checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
|
||||
QMAKE_CXXFLAGS += -Werror
|
||||
}
|
||||
}
|
||||
|
||||
*-icc-*{
|
||||
QMAKE_CXXFLAGS += \
|
||||
-isystem "$${OUT_PWD}/$${UI_DIR}" \
|
||||
-isystem "$${OUT_PWD}/$${MOC_DIR}" \
|
||||
-isystem "$${OUT_PWD}/$${RCC_DIR}" \
|
||||
$$ICC_DEBUG_CXXFLAGS
|
||||
|
||||
checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
|
||||
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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,16 +54,9 @@ $$enable_ccache()
|
|||
|
||||
DEFINES += TS_DIR=\\\"$${PWD}/../../../share/translations\\\"
|
||||
|
||||
CONFIG(debug, debug|release){
|
||||
# Debug mode
|
||||
unix {
|
||||
include(warnings.pri)
|
||||
} else {
|
||||
*-g++{
|
||||
QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
|
||||
}
|
||||
}
|
||||
}else{
|
||||
include(warnings.pri)
|
||||
|
||||
CONFIG(release, debug|release){
|
||||
# Release mode
|
||||
!win32-msvc*:CONFIG += silent
|
||||
DEFINES += V_NO_ASSERT
|
||||
|
|
@ -71,10 +64,6 @@ CONFIG(debug, debug|release){
|
|||
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll
|
||||
}
|
||||
|
||||
checkWarnings{
|
||||
unix:include(warnings.pri)
|
||||
}
|
||||
|
||||
noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols
|
||||
# do nothing
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -1,49 +1,67 @@
|
|||
#Turn on compilers warnings.
|
||||
*-g++{
|
||||
QMAKE_CXXFLAGS += \
|
||||
# Key -isystem disable checking errors in system headers.
|
||||
-isystem "$${OUT_PWD}/$${UI_DIR}" \
|
||||
-isystem "$${OUT_PWD}/$${MOC_DIR}" \
|
||||
-isystem "$${OUT_PWD}/$${RCC_DIR}" \
|
||||
$$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
|
||||
unix {
|
||||
*-g++{
|
||||
QMAKE_CXXFLAGS += \
|
||||
# Key -isystem disable checking errors in system headers.
|
||||
-isystem "$${OUT_PWD}/$${UI_DIR}" \
|
||||
-isystem "$${OUT_PWD}/$${MOC_DIR}" \
|
||||
-isystem "$${OUT_PWD}/$${RCC_DIR}" \
|
||||
$$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
|
||||
|
||||
checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
|
||||
QMAKE_CXXFLAGS += -Werror
|
||||
checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
|
||||
QMAKE_CXXFLAGS += -Werror
|
||||
}
|
||||
|
||||
noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer
|
||||
# do nothing
|
||||
} else {
|
||||
#gcc’s 4.8.0 Address Sanitizer
|
||||
#http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/
|
||||
QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer
|
||||
QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer
|
||||
QMAKE_LFLAGS += -fsanitize=address
|
||||
}
|
||||
}
|
||||
|
||||
noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer
|
||||
# do nothing
|
||||
} else {
|
||||
#gcc’s 4.8.0 Address Sanitizer
|
||||
#http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/
|
||||
QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer
|
||||
QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer
|
||||
QMAKE_LFLAGS += -fsanitize=address
|
||||
}
|
||||
}
|
||||
|
||||
clang*{
|
||||
QMAKE_CXXFLAGS += \
|
||||
# Key -isystem disable checking errors in system headers.
|
||||
-isystem "$${OUT_PWD}/$${UI_DIR}" \
|
||||
-isystem "$${OUT_PWD}/$${MOC_DIR}" \
|
||||
-isystem "$${OUT_PWD}/$${RCC_DIR}" \
|
||||
$$CLANG_DEBUG_CXXFLAGS \ # See common.pri for more details.
|
||||
-Wno-gnu-zero-variadic-macro-arguments\ # See macros QSKIP
|
||||
|
||||
checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
|
||||
QMAKE_CXXFLAGS += -Werror
|
||||
}
|
||||
}
|
||||
|
||||
*-icc-*{
|
||||
QMAKE_CXXFLAGS += \
|
||||
-isystem "$${OUT_PWD}/$${UI_DIR}" \
|
||||
-isystem "$${OUT_PWD}/$${MOC_DIR}" \
|
||||
-isystem "$${OUT_PWD}/$${RCC_DIR}" \
|
||||
$$ICC_DEBUG_CXXFLAGS
|
||||
|
||||
checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
|
||||
QMAKE_CXXFLAGS += -Werror
|
||||
clang*{
|
||||
QMAKE_CXXFLAGS += \
|
||||
# Key -isystem disable checking errors in system headers.
|
||||
-isystem "$${OUT_PWD}/$${UI_DIR}" \
|
||||
-isystem "$${OUT_PWD}/$${MOC_DIR}" \
|
||||
-isystem "$${OUT_PWD}/$${RCC_DIR}" \
|
||||
$$CLANG_DEBUG_CXXFLAGS \ # See common.pri for more details.
|
||||
-Wno-gnu-zero-variadic-macro-arguments\ # See macros QSKIP
|
||||
|
||||
checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
|
||||
QMAKE_CXXFLAGS += -Werror
|
||||
}
|
||||
}
|
||||
|
||||
*-icc-*{
|
||||
QMAKE_CXXFLAGS += \
|
||||
-isystem "$${OUT_PWD}/$${UI_DIR}" \
|
||||
-isystem "$${OUT_PWD}/$${MOC_DIR}" \
|
||||
-isystem "$${OUT_PWD}/$${RCC_DIR}" \
|
||||
$$ICC_DEBUG_CXXFLAGS
|
||||
|
||||
checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
|
||||
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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user