Merge remote-tracking branch 'origin/4.2'

Change-Id: Ib3073a0a3d80c99cf97b9839480dbf9583fa10de
This commit is contained in:
Eike Ziller
2017-01-23 13:13:05 +01:00
14 changed files with 208 additions and 31 deletions

View File

@@ -152,6 +152,7 @@ public:
QString toString(bool multiline = false, int indent = 0) const;
qulonglong toAddress() const;
int toInt() const { return m_data.toInt(); }
qint64 toLongLong() const { return m_data.toLongLong(); }
void fromString(const QString &str);
void fromStringMultiple(const QString &str);