diff options
author | Tim Jenssen <tim.jenssen@digia.com> | 2013-05-27 12:01:27 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-05-27 15:44:15 +0200 |
commit | 95dc8d8930934714e453d167f5eeaec8c8587c13 (patch) | |
tree | 664f72dfffe19bd832f4da58e1ec311298cf18f9 /tools | |
parent | d1bb751a38b70268f208998ce817b549e07a2cf5 (diff) |
binarycreator tries to copy qt_menu.nib dir
Change-Id: I86ae6eb2c1129537939fc797a88b5c5b8619fbf7
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/binarycreator/binarycreator.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp index f1fd5476c..5afd3f1dd 100644 --- a/tools/binarycreator/binarycreator.cpp +++ b/tools/binarycreator/binarycreator.cpp @@ -138,8 +138,11 @@ static int assemble(Input input, const QInstaller::Settings &settings) if (isBundle) { // output should be a bundle const QFileInfo fi(input.outputPath); + + const QString contentsResourcesPath = fi.filePath() + QLatin1String("/Contents/Resources/"); + QInstaller::mkpath(fi.filePath() + QLatin1String("/Contents/MacOS")); - QInstaller::mkpath(fi.filePath() + QLatin1String("/Contents/Resources")); + QInstaller::mkpath(contentsResourcesPath); { QFile pkgInfo(fi.filePath() + QLatin1String("/Contents/PkgInfo")); @@ -157,7 +160,11 @@ static int assemble(Input input, const QInstaller::Settings &settings) } const QString iconTargetFile = fi.completeBaseName() + QLatin1String(".icns"); - QFile::copy(iconFile, fi.filePath() + QLatin1String("/Contents/Resources/") + iconTargetFile); + QFile::copy(iconFile, contentsResourcesPath + iconTargetFile); + if (QDir(qApp->applicationDirPath() + QLatin1String("/qt_menu.nib")).exists()) { + copyDirectoryContents(qApp->applicationDirPath() + QLatin1String("/qt_menu.nib"), + contentsResourcesPath + QLatin1String("/qt_menu.nib")); + } QFile infoPList(fi.filePath() + QLatin1String("/Contents/Info.plist")); infoPList.open(QIODevice::WriteOnly); |