summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--installerbuilder/binarycreator/rcc/rccmain.cpp7
-rw-r--r--installerbuilder/common/binaryformat.cpp21
-rw-r--r--installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.cpp19
3 files changed, 0 insertions, 47 deletions
diff --git a/installerbuilder/binarycreator/rcc/rccmain.cpp b/installerbuilder/binarycreator/rcc/rccmain.cpp
index fef57a8f5..4256d5db4 100644
--- a/installerbuilder/binarycreator/rcc/rccmain.cpp
+++ b/installerbuilder/binarycreator/rcc/rccmain.cpp
@@ -246,10 +246,3 @@ int runRcc(int argc, char *argv[])
}
QT_END_NAMESPACE
-
-#if 0
-int main(int argc, char *argv[])
-{
- return QT_PREPEND_NAMESPACE(runRcc)(argc, argv);
-}
-#endif
diff --git a/installerbuilder/common/binaryformat.cpp b/installerbuilder/common/binaryformat.cpp
index c3eac2bdf..0c210bc15 100644
--- a/installerbuilder/common/binaryformat.cpp
+++ b/installerbuilder/common/binaryformat.cpp
@@ -106,27 +106,6 @@ Range<qint64> QInstaller::retrieveInt64Range(QIODevice *in)
return Range<qint64>::fromStartAndLength(start, length);
}
-
-
-#if 0
-// Faster or not?
-static void appendFileData(QIODevice *out, const QString &fileName)
-{
- QFile file(fileName);
- openForRead(file);
- qint64 size = file.size();
- QInstaller::appendInt64(out, size);
- if (size == 0)
- return;
- uchar *data = file.map(0, size);
- if (!data)
- throw Error(QInstaller::tr("Cannot map file %1.").arg(file.fileName()));
- blockingWrite(out, (const char *)data, size);
- if (!file.unmap(data))
- throw Error(QInstaller::tr("Cannot unmap file %1.").arg(file.fileName()));
-}
-#endif
-
void QInstaller::appendData(QIODevice *out, QIODevice *in, qint64 size)
{
while (size > 0) {
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.cpp
index a08d481b7..48d2aaef7 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterupdatefinder.cpp
@@ -489,25 +489,6 @@ QList<UpdateInfo> UpdateFinder::Private::applicableUpdates(UpdatesInfo *updatesI
return retList;
}
-#if 0
- // Nokia-SDK: ignore ApplicationVersion, it has no purpose and just causes
- // problems if someone bumps the config.xml application version accidentally
- // Check to see if the update repository versions match with app version
- if (!anyApp) {
- QString appVersion = updatesInfo->applicationVersion();
- appVersion = appVersion.replace(QLatin1String( ", " ), QLatin1String( "," ));
- appVersion = appVersion.replace(QLatin1String( " ," ), QLatin1String( "," ));
- QStringList versions = appVersion.split(QLatin1String( "," ), QString::SkipEmptyParts);
-
- if (appNameIndex >= versions.count())
- return retList; // please give us well formatted Updates.xml files.
-
- QString version = versions.at(appNameIndex);
- if (KDUpdater::compareVersion(this->application->applicationVersion(), version) != 0)
- return retList;
- }
-#endif
-
// Check to see if version numbers match. This means that the version
// number of the update should be greater than the version number of
// the package that is currently installed.