QT5 -- 1 of 3

Porting the codebase to QT 5 (5.2) to get the
latest bug fixes, performance and improved platform
support.

This first part is to fixup the codebase to compile
on Qt 5, but some aspects have been broken (video).

The second part is to migrate from Qwt 6.0.1 to the
latest Qwt for multiaxis support.

The third part will be to fixup any platform specific
issues or issues identified at runtime.
This commit is contained in:
Mark Liversedge
2013-12-09 09:57:13 +00:00
parent 2cadf4a374
commit 82baf90131
186 changed files with 552 additions and 313 deletions

View File

@@ -1011,7 +1011,7 @@ bool MetadataXMLParser::endElement( const QString&, const QString&, const QStrin
else if (qName == "colorfield")
colorfield = unprotect(buffer);
return TRUE;
return true;
}
bool MetadataXMLParser::startElement( const QString&, const QString&, const QString &name, const QXmlAttributes &attrs )
@@ -1035,16 +1035,16 @@ bool MetadataXMLParser::startElement( const QString&, const QString&, const QStr
}
}
return TRUE;
return true;
}
bool MetadataXMLParser::characters( const QString& str )
{
buffer += str;
return TRUE;
return true;
}
bool MetadataXMLParser::endDocument()
{
return TRUE;
return true;
}