From c22e4c7628a0e9ae0725715e0f30a9451464e7cd Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Mon, 14 Sep 2009 17:42:08 +0200
Subject: [PATCH] It's "Qt Creator" and that should reflect in the App name on
Mac.
---
doc/doc.pri | 4 ++--
qtcreator.pri | 2 +-
share/qtcreator/static.pro | 4 ++--
src/qtcreatorplugin.pri | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/doc/doc.pri b/doc/doc.pri
index 0deac0fc4ac..20daddba3bd 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -46,8 +46,8 @@ unix:!macx {
}
macx {
- DOC_DIR = $${OUT_PWD}/bin/QtCreator.app/Contents/Resources/doc
- cp_docs.commands = mkdir -p $${DOC_DIR} ; $${QMAKE_COPY} $${QCH_FILE} $${DOC_DIR}
+ DOC_DIR = "$${OUT_PWD}/bin/Qt Creator.app/Contents/Resources/doc"
+ cp_docs.commands = mkdir -p \"$${DOC_DIR}\" ; $${QMAKE_COPY} \"$${QCH_FILE}\" \"$${DOC_DIR}\"
cp_docs.depends += qch_docs
docs.depends = cp_docs
QMAKE_EXTRA_TARGETS += html_docs qch_docs cp_docs docs
diff --git a/qtcreator.pri b/qtcreator.pri
index 2a68864361d..f9bdb63993b 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -55,7 +55,7 @@ isEmpty(IDE_BUILD_TREE) {
}
IDE_APP_PATH = $$IDE_BUILD_TREE/bin
macx {
- IDE_APP_TARGET = QtCreator
+ IDE_APP_TARGET = "Qt Creator"
IDE_LIBRARY_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/PlugIns
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH
IDE_LIBEXEC_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Resources
diff --git a/share/qtcreator/static.pro b/share/qtcreator/static.pro
index 47372b6f7c8..e7021d33e1c 100644
--- a/share/qtcreator/static.pro
+++ b/share/qtcreator/static.pro
@@ -41,7 +41,7 @@ DATA_DIRS = \
copy2build.input = FILES
copy2build.output = $$IDE_DATA_PATH/${QMAKE_FUNC_FILE_IN_stripSrcDir}
isEmpty(vcproj):copy2build.variable_out = PRE_TARGETDEPS
- copy2build.commands = $$QMAKE_COPY \"${QMAKE_FILE_IN}\" \"${QMAKE_FILE_OUT}\"
+ copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
copy2build.name = COPY ${QMAKE_FILE_IN}
copy2build.CONFIG += no_link
QMAKE_EXTRA_COMPILERS += copy2build
@@ -49,7 +49,7 @@ DATA_DIRS = \
macx {
run_in_term.target = $$IDE_DATA_PATH/runInTerminal.command
run_in_term.depends = $$PWD/runInTerminal.command
- run_in_term.commands = $$QMAKE_COPY $< $@
+ run_in_term.commands = $$QMAKE_COPY \"$<\" \"$@\"
QMAKE_EXTRA_TARGETS += run_in_term
PRE_TARGETDEPS += $$run_in_term.target
QMAKE_CLEAN += $$run_in_term.target
diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri
index dcb4649e99e..15c3f6019ec 100644
--- a/src/qtcreatorplugin.pri
+++ b/src/qtcreatorplugin.pri
@@ -18,7 +18,7 @@ PLUGINSPECS = $${_PRO_FILE_PWD_}/$${TARGET}.pluginspec
copy2build.input = PLUGINSPECS
copy2build.output = $$DESTDIR/${QMAKE_FUNC_FILE_IN_stripSrcDir}
isEmpty(vcproj):copy2build.variable_out = PRE_TARGETDEPS
-copy2build.commands = $$QMAKE_COPY \"${QMAKE_FILE_IN}\" \"${QMAKE_FILE_OUT}\"
+copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
copy2build.name = COPY ${QMAKE_FILE_IN}
copy2build.CONFIG += no_link
QMAKE_EXTRA_COMPILERS += copy2build
--
GitLab