Fix FTBFS with GCC6

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/1/head
Slávek Banko 8 years ago
parent 5ea252ec15
commit 193843b027

@ -1172,7 +1172,7 @@ void TrollProjectWidget::addFiles( TQStringList &files, bool relativeToProjectRo
if ( m_shownSubproject->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) != -1 && !fileName.endsWith(".pro") ) if ( m_shownSubproject->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) != -1 && !fileName.endsWith(".pro") )
{ {
ChooseSubprojectDlg dlg( this, false ); ChooseSubprojectDlg dlg( this, 0 );
if ( dlg.exec() == TQDialog::Accepted ) if ( dlg.exec() == TQDialog::Accepted )
{ {
if ( dlg.selectedSubproject() && dlg.selectedSubproject()->scope->variableValues("TEMPLATE").findIndex( "subdirs" ) != -1 ) if ( dlg.selectedSubproject() && dlg.selectedSubproject()->scope->variableValues("TEMPLATE").findIndex( "subdirs" ) != -1 )

@ -54,7 +54,7 @@ Record *MIParser::parse(FileSymbol *file)
TokenStream *tokenStream = lexer.tokenize(file); TokenStream *tokenStream = lexer.tokenize(file);
if (!tokenStream) if (!tokenStream)
return false; return 0;
lex = file->tokenStream = tokenStream; lex = file->tokenStream = tokenStream;

Loading…
Cancel
Save