summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2016-09-03 17:17:42 +0200
committerSlávek Banko <slavek.banko@axis.cz>2016-09-03 17:17:55 +0200
commitcb10c8f6882883c0e617b20d54b5d0a71cd62fae (patch)
tree0efb51ef50ae318804fe34372b4b06a511a99d90
parentceb56ada31062b4c7d63215e6e5265eff8b58880 (diff)
downloadtdevelop-cb10c8f6882883c0e617b20d54b5d0a71cd62fae.tar.gz
tdevelop-cb10c8f6882883c0e617b20d54b5d0a71cd62fae.zip
Fix FTBFS with GCC6
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 193843b0279cfc3341c7cf4086efff78d097aba7)
-rw-r--r--buildtools/qmake/trollprojectwidget.cpp2
-rw-r--r--languages/cpp/debugger/mi/miparser.cpp2
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;