From a7ac89353455cf05d11636400aee532de62a7427 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 26 Nov 2012 16:58:54 +0100 Subject: adjust to modularization changes in ActiveQt Task-number: QTBUG-27776 Change-Id: I1c30270867d20f028bad09fdc5408a414b122f5b Reviewed-by: Oswald Buddenhagen --- mkspecs/features/win32/dumpcpp.prf | 21 +++++++++++ mkspecs/features/win32/idcidl.prf | 49 ++++++++++++++++++++++++++ mkspecs/features/win32/qaxcontainer.prf | 35 ------------------- mkspecs/features/win32/qaxserver.prf | 62 --------------------------------- 4 files changed, 70 insertions(+), 97 deletions(-) create mode 100644 mkspecs/features/win32/dumpcpp.prf create mode 100644 mkspecs/features/win32/idcidl.prf delete mode 100644 mkspecs/features/win32/qaxcontainer.prf delete mode 100644 mkspecs/features/win32/qaxserver.prf (limited to 'mkspecs/features/win32') diff --git a/mkspecs/features/win32/dumpcpp.prf b/mkspecs/features/win32/dumpcpp.prf new file mode 100644 index 0000000000..af6387bed6 --- /dev/null +++ b/mkspecs/features/win32/dumpcpp.prf @@ -0,0 +1,21 @@ +qtPrepareTool(QMAKE_DUMPCPP, dumpcpp) + +dumpcpp_decl.commands = $$QMAKE_DUMPCPP ${QMAKE_FILE_IN} -o ${QMAKE_FILE_BASE} +qaxcontainer_compat: dumpcpp_decl.commands += -compat +dumpcpp_decl.output = ${QMAKE_FILE_BASE}.h +dumpcpp_decl.input = TYPELIBS +dumpcpp_decl.variable_out = HEADERS +dumpcpp_decl.name = DUMP +dumpcpp_decl.CONFIG += no_link + +QMAKE_EXTRA_COMPILERS += dumpcpp_decl + + +dumpcpp_impl.commands = $$QMAKE_DUMPCPP -donothing +dumpcpp_impl.output = ${QMAKE_FILE_BASE}.cpp +dumpcpp_impl.input = TYPELIBS +dumpcpp_impl.variable_out = SOURCES +dumpcpp_impl.name = CPP +dumpcpp_impl.depends = ${QMAKE_FILE_BASE}.h + +QMAKE_EXTRA_COMPILERS += dumpcpp_impl diff --git a/mkspecs/features/win32/idcidl.prf b/mkspecs/features/win32/idcidl.prf new file mode 100644 index 0000000000..4fb1a08bde --- /dev/null +++ b/mkspecs/features/win32/idcidl.prf @@ -0,0 +1,49 @@ +build_pass:console: { + warning("QAxServer applications cannot be console applications.") + warning("Remove 'console' from your CONFIG.") +} + +ACTIVEQT_VERSION = $$VERSION +isEmpty(ACTIVEQT_VERSION):ACTIVEQT_VERSION = 1.0 + +qtPrepareTool(QMAKE_IDC, idc) +contains(TEMPLATE, "vc.*") { + ACTIVEQT_IDC = $${QMAKE_IDC} + ACTIVEQT_IDL = $${QMAKE_IDL} + ACTIVEQT_TARGET = "$(TargetPath)" + win32-msvc { + ACTIVEQT_NEWLINE = $$escape_expand(\\t) + ACTIVEQT_OUTPUT = $(IntDir)/$${TARGET} + } else { + ACTIVEQT_NEWLINE = $$escape_expand(\\n\\t) + ACTIVEQT_OUTPUT = $(IntDir)$${TARGET} + } + ACTIVEQT_TLBOUT = "$(TargetDir)/$${TARGET}.tlb" + GENERATED += $${OBJECTS_DIR}/$${TARGET}.idl $${ACTIVEQT_TLBOUT} +} else { + ACTIVEQT_IDC = -$(IDC) + ACTIVEQT_IDL = -$(IDL) + ACTIVEQT_NEWLINE = $$escape_expand(\\n\\t) + ACTIVEQT_TARGET = $(DESTDIR_TARGET) + ACTIVEQT_OUTPUT = $(OBJECTS_DIR)/$${TARGET} + isEmpty(DESTDIR) { + ACTIVEQT_TLBOUT = $${TARGET}.tlb + } else { + ACTIVEQT_TLBOUT = $${DESTDIR}/$${TARGET}.tlb + } +} + +!qaxserver_no_postlink { + !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK += $$quote($$ACTIVEQT_NEWLINE) + QMAKE_POST_LINK += $$quote($$ACTIVEQT_IDC $${ACTIVEQT_TARGET} /idl $${ACTIVEQT_OUTPUT}.idl -version $${ACTIVEQT_VERSION}$${ACTIVEQT_NEWLINE}) + !isEmpty(RC_FILE) { + QMAKE_POST_LINK += $$quote($$ACTIVEQT_IDL "$${ACTIVEQT_OUTPUT}.idl" /nologo /tlb "$${ACTIVEQT_OUTPUT}.tlb"$$ACTIVEQT_NEWLINE) + QMAKE_POST_LINK += $$quote($$ACTIVEQT_IDC $${ACTIVEQT_TARGET} /tlb $${ACTIVEQT_OUTPUT}.tlb$$ACTIVEQT_NEWLINE) + } else { + 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) + QMAKE_CLEAN += $${ACTIVEQT_OUTPUT}.idl $${ACTIVEQT_OUTPUT}.tlb +} + diff --git a/mkspecs/features/win32/qaxcontainer.prf b/mkspecs/features/win32/qaxcontainer.prf deleted file mode 100644 index 2ea31cf16f..0000000000 --- a/mkspecs/features/win32/qaxcontainer.prf +++ /dev/null @@ -1,35 +0,0 @@ -!debug_and_release|build_pass { - CONFIG(debug, debug|release) { - LIBS += -lQAxContainerd - } else { - LIBS += -lQAxContainer - } -} else { - LIBS += -lQAxContainer -} - -QMAKE_LIBDIR += $$QT.activeqt.libs -INCLUDEPATH += $$QT.activeqt.includes -QMAKE_LIBS += $$QMAKE_LIBS_GUI - -qtPrepareTool(QMAKE_DUMPCPP, dumpcpp) - -dumpcpp_decl.commands = $$QMAKE_DUMPCPP ${QMAKE_FILE_IN} -o ${QMAKE_FILE_BASE} -qaxcontainer_compat: dumpcpp_decl.commands += -compat -dumpcpp_decl.output = ${QMAKE_FILE_BASE}.h -dumpcpp_decl.input = TYPELIBS -dumpcpp_decl.variable_out = HEADERS -dumpcpp_decl.name = DUMP -dumpcpp_decl.CONFIG += no_link - -QMAKE_EXTRA_COMPILERS += dumpcpp_decl - - -dumpcpp_impl.commands = $$QMAKE_DUMPCPP -donothing -dumpcpp_impl.output = ${QMAKE_FILE_BASE}.cpp -dumpcpp_impl.input = TYPELIBS -dumpcpp_impl.variable_out = SOURCES -dumpcpp_impl.name = CPP -dumpcpp_impl.depends = ${QMAKE_FILE_BASE}.h - -QMAKE_EXTRA_COMPILERS += dumpcpp_impl diff --git a/mkspecs/features/win32/qaxserver.prf b/mkspecs/features/win32/qaxserver.prf deleted file mode 100644 index 748da22ffb..0000000000 --- a/mkspecs/features/win32/qaxserver.prf +++ /dev/null @@ -1,62 +0,0 @@ -build_pass:console: { - warning("QAxServer applications cannot be console applications.") - warning("Remove 'console' from your CONFIG.") -} - -ACTIVEQT_VERSION = $$VERSION -isEmpty(ACTIVEQT_VERSION):ACTIVEQT_VERSION = 1.0 - -DEFINES += QAXSERVER -INCLUDEPATH += $$QT.activeqt.includes - -qtPrepareTool(QMAKE_IDC, idc) -contains(TEMPLATE, "vc.*") { - ACTIVEQT_IDC = $${QMAKE_IDC} - ACTIVEQT_IDL = $${QMAKE_IDL} - ACTIVEQT_TARGET = "$(TargetPath)" - win32-msvc { - ACTIVEQT_NEWLINE = $$escape_expand(\\t) - ACTIVEQT_OUTPUT = $(IntDir)/$${TARGET} - } else { - ACTIVEQT_NEWLINE = $$escape_expand(\\n\\t) - ACTIVEQT_OUTPUT = $(IntDir)$${TARGET} - } - ACTIVEQT_TLBOUT = "$(TargetDir)/$${TARGET}.tlb" - GENERATED += $${OBJECTS_DIR}/$${TARGET}.idl $${ACTIVEQT_TLBOUT} -} else { - ACTIVEQT_IDC = -$(IDC) - ACTIVEQT_IDL = -$(IDL) - ACTIVEQT_NEWLINE = $$escape_expand(\\n\\t) - ACTIVEQT_TARGET = $(DESTDIR_TARGET) - ACTIVEQT_OUTPUT = $(OBJECTS_DIR)/$${TARGET} - isEmpty(DESTDIR) { - ACTIVEQT_TLBOUT = $${TARGET}.tlb - } else { - ACTIVEQT_TLBOUT = $${DESTDIR}/$${TARGET}.tlb - } -} - -!qaxserver_no_postlink { - !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK += $$quote($$ACTIVEQT_NEWLINE) - QMAKE_POST_LINK += $$quote($$ACTIVEQT_IDC $${ACTIVEQT_TARGET} /idl $${ACTIVEQT_OUTPUT}.idl -version $${ACTIVEQT_VERSION}$${ACTIVEQT_NEWLINE}) - !isEmpty(RC_FILE) { - QMAKE_POST_LINK += $$quote($$ACTIVEQT_IDL "$${ACTIVEQT_OUTPUT}.idl" /nologo /tlb "$${ACTIVEQT_OUTPUT}.tlb"$$ACTIVEQT_NEWLINE) - QMAKE_POST_LINK += $$quote($$ACTIVEQT_IDC $${ACTIVEQT_TARGET} /tlb $${ACTIVEQT_OUTPUT}.tlb$$ACTIVEQT_NEWLINE) - } else { - 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) - QMAKE_CLEAN += $${ACTIVEQT_OUTPUT}.idl $${ACTIVEQT_OUTPUT}.tlb -} - -qt:!target_qt { - CONFIG(debug, debug|release) { - QMAKE_LIBS_QT_ENTRY = -lQAxServerd - } else { - QMAKE_LIBS_QT_ENTRY = -lQAxServer - } - dll:QMAKE_LIBS += $$QMAKE_LIBS_QT_ENTRY - QMAKE_LIBDIR += $$QT.activeqt.libs - QMAKE_LIBS += $$QMAKE_LIBS_GUI -} -- cgit v1.2.3