diff options
Diffstat (limited to 'mkspecs/features/win32')
| -rw-r--r-- | mkspecs/features/win32/dumpcpp.prf (renamed from mkspecs/features/win32/qaxcontainer.prf) | 14 | ||||
| -rw-r--r-- | mkspecs/features/win32/idcidl.prf (renamed from mkspecs/features/win32/qaxserver.prf) | 13 |
2 files changed, 0 insertions, 27 deletions
diff --git a/mkspecs/features/win32/qaxcontainer.prf b/mkspecs/features/win32/dumpcpp.prf index 2ea31cf16f..af6387bed6 100644 --- a/mkspecs/features/win32/qaxcontainer.prf +++ b/mkspecs/features/win32/dumpcpp.prf @@ -1,17 +1,3 @@ -!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} diff --git a/mkspecs/features/win32/qaxserver.prf b/mkspecs/features/win32/idcidl.prf index 748da22ffb..4fb1a08bde 100644 --- a/mkspecs/features/win32/qaxserver.prf +++ b/mkspecs/features/win32/idcidl.prf @@ -6,9 +6,6 @@ build_pass:console: { 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} @@ -50,13 +47,3 @@ contains(TEMPLATE, "vc.*") { 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 -} |