diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2019-08-23 11:05:07 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2019-08-23 11:05:07 +0300 |
| commit | 516492370b95e9c07cad4080ef713d5b2b3f2f94 (patch) | |
| tree | c094d82a3cebf3aaff4182ae7824c3efbce6d3a3 /tools/devtool/main.cpp | |
| parent | 3b310a3ec13a743ae2258bc43d92a5df42c6ad37 (diff) | |
| parent | 8f7af86198935849c74c71add7c9ca081347fb85 (diff) | |
Merge remote-tracking branch 'origin/3.1' into master
Change-Id: I8b203e12283374aed707e0e89c2f73d44ff296cb
Diffstat (limited to 'tools/devtool/main.cpp')
| -rw-r--r-- | tools/devtool/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/devtool/main.cpp b/tools/devtool/main.cpp index d75ab4e81..dbe8f2b09 100644 --- a/tools/devtool/main.cpp +++ b/tools/devtool/main.cpp @@ -168,7 +168,7 @@ int main(int argc, char *argv[]) if (QInstaller::isInBundle(path, &bundlePath)) { path = QDir(bundlePath).filePath(QLatin1String("Contents/Resources/installer.dat")); } -#ifndef Q_OS_OSX +#ifndef Q_OS_MACOS QFileInfo fi = QFileInfo(path); bundlePath = path; QString tmp = QDir(fi.path()).filePath(QLatin1String("installer.dat")); |