From 193843b0279cfc3341c7cf4086efff78d097aba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 3 Sep 2016 17:17:42 +0200 Subject: [PATCH] Fix FTBFS with GCC6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- buildtools/qmake/trollprojectwidget.cpp | 2 +- languages/cpp/debugger/mi/miparser.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index dd5c5d03..7a70fb1a 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -1172,7 +1172,7 @@ void TrollProjectWidget::addFiles( TQStringList &files, bool relativeToProjectRo 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.selectedSubproject() && dlg.selectedSubproject()->scope->variableValues("TEMPLATE").findIndex( "subdirs" ) != -1 ) diff --git a/languages/cpp/debugger/mi/miparser.cpp b/languages/cpp/debugger/mi/miparser.cpp index fdd16137..e078c04c 100644 --- a/languages/cpp/debugger/mi/miparser.cpp +++ b/languages/cpp/debugger/mi/miparser.cpp @@ -54,7 +54,7 @@ Record *MIParser::parse(FileSymbol *file) TokenStream *tokenStream = lexer.tokenize(file); if (!tokenStream) - return false; + return 0; lex = file->tokenStream = tokenStream;