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

GCC warnings. Don't use PCH if use ccache.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-10-26 12:04:20 +02:00
parent d1f18dc9a0
commit f1796eaf90
5 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
common.pri
View File

@ -100,18 +100,20 @@ defineTest(forceCopyToDestdir) {
# We use precompiled headers for more fast compilation source code.
defineReplace(set_PCH){
macx:clang*{
# Precompiled headers don't work with clang on macx.
} else {
CONFIG += precompile_header # Turn on creation precompiled headers (PCH).
export(CONFIG) # export value to global variable.
unix:no_ccache|win32{
macx:clang*{
# Precompiled headers don't work with clang on macx.
} else {
CONFIG += precompile_header # Turn on creation precompiled headers (PCH).
export(CONFIG) # export value to global variable.
PRECOMPILED_HEADER = stable.h # Header file with all all static headers: libraries, static local headers.
export(PRECOMPILED_HEADER) # export value to global variable
PRECOMPILED_HEADER = stable.h # Header file with all all static headers: libraries, static local headers.
export(PRECOMPILED_HEADER) # export value to global variable
win32-msvc* {
PRECOMPILED_SOURCE = stable.cpp # MSVC need also cpp file.
export(PRECOMPILED_SOURCE) # export value to global variable.
win32-msvc* {
PRECOMPILED_SOURCE = stable.cpp # MSVC need also cpp file.
export(PRECOMPILED_SOURCE) # export value to global variable.
}
}
}
return(true)

4
src/libs/qmuparser/qmuparser.cpp
View File

@ -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));
}
//---------------------------------------------------------------------------------------------------------------------

4
src/libs/qmuparser/qmuparsertest.cpp
View File

@ -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 );

1
src/libs/vdxf/dxflib/dl_writer_ascii.cpp
View File

@ -31,6 +31,7 @@
#include <stdio.h>
#include <string.h>
#include <QtGlobal>
#include "dl_writer_ascii.h"

5
src/libs/vlayout/vlayout.pro
View File

@ -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 {