diff options
author | Katja Marttila <katja.marttila@qt.io> | 2016-09-14 13:15:05 +0000 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2016-09-15 07:01:05 +0000 |
commit | 49201fdb99ee6ca7f6bee296f51f5036345017c6 (patch) | |
tree | 392f84e474b15eb60faf477cec226571b4ad728e /src/sdk | |
parent | fc0b26f4d202776456ceca1be4206739a8be9247 (diff) |
Revert "Allow signing maintenancetool in Windows"
This reverts commit 76fd6e8f2953347ea0bf7a57b643968784bc9acc.
The change caused that two installation files were needed -
one executable and one dat file. Many users did not find it acceptable.
We need to figure out something else.
Change-Id: Ief12cd47f9897cee8a234d8611a5c18296d42b1c
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Diffstat (limited to 'src/sdk')
-rw-r--r-- | src/sdk/sdkapp.h | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/src/sdk/sdkapp.h b/src/sdk/sdkapp.h index d06cd9eb3..c5cc4ca50 100644 --- a/src/sdk/sdkapp.h +++ b/src/sdk/sdkapp.h @@ -76,26 +76,21 @@ public: installer binary itself, which contains the binary layout and the binary content. In case of an maintenance tool, it will return a binary that has just a binary layout append. - Note on OS X and Windows: For compatibility reason this function will return the .dat file - as the binary layout cannot be appended to the actual installer / maintenance tool binary - itself because of signing. .dat file is located inside the resource folder in the application - bundle in OS X and next to maintenance tool in Windows. + Note on OS X: For compatibility reason this function will return the a .dat file located + inside the resource folder in the application bundle, as on OS X the binary layout cannot + be appended to the actual installer / maintenance tool binary itself because of signing. */ QString binaryFile() const { QString binaryFile = QCoreApplication::applicationFilePath(); -#if defined Q_OS_OSX || defined Q_OS_WIN - // The installer binary on OSX and Windows does not contain the binary - // content, it's put into the resources folder as separate file. - // Adjust the actual binary path. No error checking here since we - // will fail later while reading the binary content. - QDir resourcePath(QFileInfo(binaryFile).dir()); - #ifdef Q_OS_OSX + // The installer binary on OSX does not contain the binary content, it's put into + // the resources folder as separate file. Adjust the actual binary path. No error + // checking here since we will fail later while reading the binary content. + QDir resourcePath(QFileInfo(binaryFile).dir()); resourcePath.cdUp(); resourcePath.cd(QLatin1String("Resources")); -#endif - binaryFile = resourcePath.filePath(QLatin1String("installer.dat")); + return resourcePath.filePath(QLatin1String("installer.dat")); #endif return binaryFile; } @@ -119,9 +114,6 @@ public: QString bundlePath; if (QInstaller::isInBundle(fi.absoluteFilePath(), &bundlePath)) fi.setFile(bundlePath); -#ifdef Q_OS_WIN - return fi.absoluteDir().filePath(qApp->applicationName() + QLatin1String(".dat")); -#endif return fi.absoluteDir().filePath(fi.baseName() + QLatin1String(".dat")); } return QString(); |