diff options
Diffstat (limited to 'mkspecs/features/win32/idcidl.prf')
| -rw-r--r-- | mkspecs/features/win32/idcidl.prf | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mkspecs/features/win32/idcidl.prf b/mkspecs/features/win32/idcidl.prf index 85e4cb9c5f..a688b3ff41 100644 --- a/mkspecs/features/win32/idcidl.prf +++ b/mkspecs/features/win32/idcidl.prf @@ -13,7 +13,7 @@ qtPrepareTool(QMAKE_IDC, idc) contains(TEMPLATE, "vc.*") { ACTIVEQT_IDC = $${QMAKE_IDC} ACTIVEQT_IDL = $${QMAKE_IDL} - ACTIVEQT_TARGET = "$(TargetPath)" + ACTIVEQT_TARGET = \"$(TargetPath)\" win32-msvc { ACTIVEQT_NEWLINE = $$escape_expand(\\t) ACTIVEQT_OUTPUT = $(IntDir)/$${TARGET} @@ -21,7 +21,7 @@ contains(TEMPLATE, "vc.*") { ACTIVEQT_NEWLINE = $$escape_expand(\\n\\t) ACTIVEQT_OUTPUT = $(IntDir)$${TARGET} } - ACTIVEQT_TLBOUT = "$(TargetDir)/$${TARGET}.tlb" + ACTIVEQT_TLBOUT = \"$(TargetDir)/$${TARGET}.tlb\" GENERATED += $${OBJECTS_DIR}/$${TARGET}.idl $${ACTIVEQT_TLBOUT} } else { ACTIVEQT_IDC = -$(IDC) @@ -46,7 +46,8 @@ contains(TEMPLATE, "vc.*") { QMAKE_POST_LINK += $$quote($$ACTIVEQT_IDL "$${ACTIVEQT_OUTPUT}.idl" /nologo /tlb "$${ACTIVEQT_TLBOUT}"$$ACTIVEQT_NEWLINE) message("No rc-file linked into project; type library will be a separate file.") } - QMAKE_POST_LINK += $$quote($$ACTIVEQT_IDC $${ACTIVEQT_TARGET} /regserver) + !qaxserver_no_register: \ + QMAKE_POST_LINK += $$quote($$ACTIVEQT_IDC $${ACTIVEQT_TARGET} /regserver) QMAKE_CLEAN += $${ACTIVEQT_OUTPUT}.idl $${ACTIVEQT_OUTPUT}.tlb } |