diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2013-04-03 16:50:35 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-04-04 10:32:35 +0200 |
| commit | 546b7d16d017c9cffdff731400207177b7499488 (patch) | |
| tree | 377a6c5fdee52dc32c0bf8452ec6d48359f1e626 /tools | |
| parent | f6d6b61f0144c52126f0b11edf82e8660efc18c7 (diff) | |
| parent | 59204c3a70b2067f8df39a57bb70a3dfb944a4b7 (diff) | |
Merge remote-tracking branch 'origin/1.3'
Conflicts:
installerfw.pri
src/libs/installer/settings.cpp
tests/auto/installer/settings/tst_settings.cpp
Change-Id: Idb89f22fe940a730ed03a7d10f11e1b5fa655b49
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/build_installer.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/build_installer.py b/tools/build_installer.py index 44fa0c106..a301c6f48 100644 --- a/tools/build_installer.py +++ b/tools/build_installer.py @@ -24,6 +24,8 @@ def parse_arguments(): parser.add_argument('--doc-qmake', dest='doc_qmake', required=True, help='path to qmake that will be used to generate the documentation') parser.add_argument('--make', dest='make', required=True, help='make command') parser.add_argument('--targetdir', dest='target_dir', required=True, help='directory the generated installer will be placed in') + if sys.platform == 'darwin': + parser.add_argument('--qt_menu_nib', dest='menu_nib', required=True, help='location of qt_menu.nib (usually src/gui/mac/qt_menu.nib)') args = parser.parse_args() @@ -97,6 +99,8 @@ def package(): package_dir = os.path.join(src_dir, 'dist', 'packages') installer_path = os.path.join(src_dir, 'dist', 'packages') run((binary_creator, '--offline-only', '-c', config_file, '-p', package_dir, target_path)) + if sys.platform == 'darwin': + shutil.copytree(args.menu_nib, target_path + '.app/Contents/Resources/qt_menu.nib') parse_arguments() |