diff options
| author | kh1 <karsten.heimrich@digia.com> | 2012-11-19 16:44:52 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2012-11-20 10:40:47 +0100 |
| commit | 311045065e4080ed24ef3c3811da9c9ea4711845 (patch) | |
| tree | 129b63f878e32b71b0089f2b16b4b81165ff3c52 /src/libs/kdtools | |
| parent | c7d5718a6dedaa4bf97fe42f2e190dd9c7d6afb2 (diff) | |
Some changes to start compile with Qt5.
Change-Id: Ie6a3ba7b3c0b24fc292d0d7444ae920dfa866a54
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'src/libs/kdtools')
| -rw-r--r-- | src/libs/kdtools/kdrunoncechecker.cpp | 2 | ||||
| -rw-r--r-- | src/libs/kdtools/kdupdaterupdateoperation.cpp | 3 | ||||
| -rw-r--r-- | src/libs/kdtools/kdupdaterupdatesinfo.cpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/libs/kdtools/kdrunoncechecker.cpp b/src/libs/kdtools/kdrunoncechecker.cpp index 8e0af3ddc..702016d71 100644 --- a/src/libs/kdtools/kdrunoncechecker.cpp +++ b/src/libs/kdtools/kdrunoncechecker.cpp @@ -63,7 +63,7 @@ public: bool operator()(const ProcessInfo &info) { -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN if (info.name == m_name) return true; const QFileInfo fi(info.name); diff --git a/src/libs/kdtools/kdupdaterupdateoperation.cpp b/src/libs/kdtools/kdupdaterupdateoperation.cpp index 2c4af4b03..40d2e5ada 100644 --- a/src/libs/kdtools/kdupdaterupdateoperation.cpp +++ b/src/libs/kdtools/kdupdaterupdateoperation.cpp @@ -312,7 +312,8 @@ QDomDocument UpdateOperation::toXml() const value.setAttribute(QLatin1String("name"), it.key()); value.setAttribute(QLatin1String("type"), QLatin1String( QVariant::typeToName( variant.type()))); - if (variant.type() != QVariant::List && variant.type() != QVariant::StringList && qVariantCanConvert<QString>(variant)) { + if (variant.type() != QVariant::List && variant.type() != QVariant::StringList + && variant.canConvert(QVariant::String)) { // it can convert to string? great! value.appendChild( doc.createTextNode(variant.toString())); } else { diff --git a/src/libs/kdtools/kdupdaterupdatesinfo.cpp b/src/libs/kdtools/kdupdaterupdatesinfo.cpp index 756fcbf9a..c06449828 100644 --- a/src/libs/kdtools/kdupdaterupdatesinfo.cpp +++ b/src/libs/kdtools/kdupdaterupdatesinfo.cpp @@ -154,7 +154,7 @@ bool UpdatesInfo::UpdatesInfoData::parsePackageUpdateElement(const QDomElement & UpdateFileInfo ufInfo; ufInfo.compressedSize = childE.attribute(QLatin1String("CompressedSize")).toLongLong(); ufInfo.uncompressedSize = childE.attribute(QLatin1String("UncompressedSize")).toLongLong(); - ufInfo.sha1sum = QByteArray::fromHex(childE.attribute(QLatin1String("sha1sum")).toAscii()); + ufInfo.sha1sum = QByteArray::fromHex(childE.attribute(QLatin1String("sha1sum")).toLatin1()); ufInfo.fileName = childE.text(); info.updateFiles.append(ufInfo); } else if (childE.tagName() == QLatin1String("Licenses")) { |