summaryrefslogtreecommitdiffstats
path: root/tools/binarycreator/rcc
diff options
context:
space:
mode:
authorkh1 <karsten.heimrich@digia.com>2014-06-02 09:46:41 +0200
committerKarsten Heimrich <karsten.heimrich@digia.com>2014-06-02 09:57:13 +0200
commite89721bce16d6486e47b5b88d24467face5a11aa (patch)
tree268bad4a296f3dd02c83d1735fd7b76be38623d8 /tools/binarycreator/rcc
parentd5b02dd37312ee9a9682caff9fae925c04323e8f (diff)
Cleanup to support Qt5 only.
Change-Id: Ib8f61229ce2f07e52c22a15e10dc817aca860ead Reviewed-by: Niels Weber <niels.weber@digia.com>
Diffstat (limited to 'tools/binarycreator/rcc')
-rw-r--r--tools/binarycreator/rcc/rcc.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/tools/binarycreator/rcc/rcc.cpp b/tools/binarycreator/rcc/rcc.cpp
index 2750986ed..b79e97493 100644
--- a/tools/binarycreator/rcc/rcc.cpp
+++ b/tools/binarycreator/rcc/rcc.cpp
@@ -297,11 +297,7 @@ qint64 RCCFileInfo::writeDataName(RCCResourceLibrary &lib, qint64 offset)
offset += 2;
// write the hash
-#if QT_VERSION < 0x050000
- lib.writeNumber4(qHash(m_name));
-#else
lib.writeNumber4(qt_hash(m_name));
-#endif
if (text)
lib.writeString("\n ");
offset += 4;
@@ -887,11 +883,7 @@ bool RCCResourceLibrary::writeDataNames()
static bool qt_rcc_compare_hash(const RCCFileInfo *left, const RCCFileInfo *right)
{
-#if QT_VERSION < 0x050000
- return qHash(left->m_name) < qHash(right->m_name);
-#else
return qt_hash(left->m_name) < qt_hash(right->m_name);
-#endif
}
bool RCCResourceLibrary::writeDataStructure()