Build with Clang.

--HG--
branch : develop
This commit is contained in:
dismine 2014-05-31 17:33:37 +03:00
parent 07f75f7212
commit 19c6386973
5 changed files with 17 additions and 6 deletions

View File

@ -84,8 +84,13 @@ TRANSLATIONS += share/translations/valentina.ts \
share/translations/valentina_nl.ts share/translations/valentina_nl.ts
unix { unix {
*-g++{
QMAKE_CXX = ccache g++ QMAKE_CXX = ccache g++
} }
clang*{
QMAKE_CXX = ccache clang++
}
}
CONFIG += precompile_header CONFIG += precompile_header
# Precompiled headers (PCH) # Precompiled headers (PCH)

View File

@ -80,7 +80,7 @@ ConfigDialog::ConfigDialog(QWidget *parent) :
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void ConfigDialog::changePage(QListWidgetItem *current, QListWidgetItem *previous) void ConfigDialog::changePage(QListWidgetItem *current, QListWidgetItem *previous)
{ {
if (current == false) if (current == nullptr)
{ {
current = previous; current = previous;
} }

View File

@ -56,9 +56,15 @@ unix {
target.path = /usr/lib target.path = /usr/lib
INSTALLS += target INSTALLS += target
*-g++{
QMAKE_CXX = ccache g++ QMAKE_CXX = ccache g++
} }
clang*{
QMAKE_CXX = ccache clang++
}
}
CONFIG += precompile_header CONFIG += precompile_header
# Precompiled headers (PCH) # Precompiled headers (PCH)
PRECOMPILED_HEADER = stable.h PRECOMPILED_HEADER = stable.h

View File

@ -298,7 +298,7 @@ public:
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
int GetPri() const int GetPri() const
{ {
if ( m_pCallback.get() == false) if ( m_pCallback.get() == nullptr)
{ {
throw QmuParserError ( ecINTERNAL_ERROR ); throw QmuParserError ( ecINTERNAL_ERROR );
} }
@ -424,7 +424,7 @@ public:
{ {
assert ( m_pCallback.get() ); assert ( m_pCallback.get() );
if ( m_pCallback->GetAddr() == false) if ( m_pCallback->GetAddr() == nullptr)
{ {
throw QmuParserError ( ecINTERNAL_ERROR ); throw QmuParserError ( ecINTERNAL_ERROR );
} }

View File

@ -884,7 +884,7 @@ bool QmuParserTokenReader::IsVarTok ( token_type &a_Tok )
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
bool QmuParserTokenReader::IsStrVarTok ( token_type &a_Tok ) bool QmuParserTokenReader::IsStrVarTok ( token_type &a_Tok )
{ {
if ( m_pStrVarDef == false || m_pStrVarDef->empty() ) if ( m_pStrVarDef == nullptr || m_pStrVarDef->empty() )
{ {
return false; return false;
} }