summaryrefslogtreecommitdiffstats
path: root/tools/devtool/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tools/devtool/main.cpp')
-rw-r--r--tools/devtool/main.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/tools/devtool/main.cpp b/tools/devtool/main.cpp
index c9aaab71c..27c459ecc 100644
--- a/tools/devtool/main.cpp
+++ b/tools/devtool/main.cpp
@@ -173,6 +173,11 @@ int main(int argc, char *argv[])
if (QInstaller::isInBundle(path, &bundlePath))
path = QDir(bundlePath).filePath(QLatin1String("Contents/Resources/installer.dat"));
+#ifdef Q_OS_WIN
+ QDir resourcePath(path);
+ resourcePath.cdUp();
+ path = resourcePath.filePath(QLatin1String("installer.dat"));
+#endif
int result = EXIT_FAILURE;
QVector<QByteArray> resourceMappings;
quint64 cookie = QInstaller::BinaryContent::MagicCookie;
@@ -191,8 +196,12 @@ int main(int argc, char *argv[])
QFileInfo fi(path);
if (QInstaller::isInBundle(fi.absoluteFilePath(), &bundlePath))
fi.setFile(bundlePath);
+#ifdef Q_OS_WIN
+ QFileInfo appName = arguments.first();
+ path = fi.absoluteDir().filePath(appName.baseName() + QLatin1String(".dat"));
+#else
path = fi.absolutePath() + QLatin1Char('/') + fi.baseName() + QLatin1String(".dat");
-
+#endif
tmp.close();
tmp.setFileName(path);
QInstaller::openForRead(&tmp);