GCC warnings. Don't use PCH if use ccache.
--HG-- branch : develop
This commit is contained in:
parent
d1f18dc9a0
commit
f1796eaf90
|
@ -100,6 +100,7 @@ defineTest(forceCopyToDestdir) {
|
|||
|
||||
# We use precompiled headers for more fast compilation source code.
|
||||
defineReplace(set_PCH){
|
||||
unix:no_ccache|win32{
|
||||
macx:clang*{
|
||||
# Precompiled headers don't work with clang on macx.
|
||||
} else {
|
||||
|
@ -114,6 +115,7 @@ defineReplace(set_PCH){
|
|||
export(PRECOMPILED_SOURCE) # export value to global variable.
|
||||
}
|
||||
}
|
||||
}
|
||||
return(true)
|
||||
}
|
||||
|
||||
|
|
|
@ -322,8 +322,8 @@ void QmuParser::InitFun()
|
|||
*/
|
||||
void QmuParser::InitConst()
|
||||
{
|
||||
DefineConst("_pi", (qreal)M_PI);
|
||||
DefineConst("_e", (qreal)M_E);
|
||||
DefineConst("_pi", static_cast<qreal>(M_PI));
|
||||
DefineConst("_e", static_cast<qreal>(M_E));
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
|
|
|
@ -1264,8 +1264,8 @@ int QmuParserTester::EqnTest ( const QString &a_str, double a_fRes, bool a_fPass
|
|||
|
||||
p1.reset ( new qmu::QmuParser() );
|
||||
// Add constants
|
||||
p1->DefineConst ( "pi", ( qreal ) M_PI );
|
||||
p1->DefineConst ( "e", ( qreal ) M_E );
|
||||
p1->DefineConst ( "pi", static_cast<qreal>(M_PI) );
|
||||
p1->DefineConst ( "e", static_cast<qreal>(M_E) );
|
||||
p1->DefineConst ( "const", 1 );
|
||||
p1->DefineConst ( "const1", 2 );
|
||||
p1->DefineConst ( "const2", 3 );
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <QtGlobal>
|
||||
|
||||
#include "dl_writer_ascii.h"
|
||||
|
||||
|
|
|
@ -59,6 +59,11 @@ CONFIG(debug, debug|release){
|
|||
-isystem "$${OUT_PWD}/$${RCC_DIR}" \
|
||||
$$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
|
||||
|
||||
# -isystem key works only for headers. In some cases it's not enough. But we can't delete these warnings and
|
||||
# want them in the global list. Compromise decision is to delete them from the local list.
|
||||
QMAKE_CXXFLAGS -= \
|
||||
-Wno-long-long \
|
||||
|
||||
noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer
|
||||
# do nothing
|
||||
} else {
|
||||
|
|
Loading…
Reference in New Issue
Block a user