diff --git a/doc/doc.pri b/doc/doc.pri index 0deac0fc4acd0737ff5c8ef89f59cacd3ef7c2da..20daddba3bda6e8612fa49ace7baf3eee9a0c171 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 2a68864361d579246a46c4ddcda49fa1d8003df6..f9bdb63993ba5b2d051fac153c3c79f114c0c426 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 47372b6f7c8cb24fcb7b5e7766b4967a565dc728..e7021d33e1c87d831ef8cb7868628fceb8770f2b 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 dcb4649e99ee72efec3ac8d9ff883cc18d2c4a7f..15c3f6019ec63fe2ea876837b835b62c296b2e01 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