adjust to modularization changes in ActiveQt

Task-number: QTBUG-27776
Change-Id: I1c30270867d20f028bad09fdc5408a414b122f5b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index 2eb748c..586dae3 100644 (file)
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -89,6 +89,14 @@ uitools {
     warning("CONFIG+=uitools is deprecated. Use QT+=uitools instead.")
     QT += uitools
 }
+qaxcontainer {
+    warning("CONFIG+=qaxcontainer is deprecated. Use QT+=axcontainer instead.")
+    QT += axcontainer
+}
+qaxserver {
+    warning("CONFIG+=qaxserver is deprecated. Use QT+=axserver instead.")
+    QT += axserver
+}
 
 unset(using_privates)
 qtAddModules(QT, LIBS)

diff --git a/mkspecs/features/win32/qaxcontainer.prf b/mkspecs/features/win32/dumpcpp.prf
similarity index 69%
rename from mkspecs/features/win32/qaxcontainer.prf
rename to mkspecs/features/win32/dumpcpp.prf
index 2ea31cf..af6387b 100644 (file)
--- 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
similarity index 85%
rename from mkspecs/features/win32/qaxserver.prf
rename to mkspecs/features/win32/idcidl.prf
index 748da22..4fb1a08 100644 (file)
--- 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
-}