From 7e0197e1190e8c579e1cd639b39af4e778f40fb8 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Mon, 22 May 2017 16:35:39 +0200
Subject: [PATCH] Fix VS project generation for ActiveQt server projects

Remove VS 6 support code that was erroneously triggered.

Task-number: QTBUG-60895
Change-Id: I12c0afe09e8fb200e5050c83ac5f34ad2376fd2e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 mkspecs/features/win32/idcidl.prf | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/mkspecs/features/win32/idcidl.prf b/mkspecs/features/win32/idcidl.prf
index fba7173e79..922ae3f99e 100644
--- a/mkspecs/features/win32/idcidl.prf
+++ b/mkspecs/features/win32/idcidl.prf
@@ -14,13 +14,8 @@ 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_NEWLINE = $$escape_expand(\\n\\t)
+    ACTIVEQT_OUTPUT = $(IntDir)$${TARGET}
     ACTIVEQT_TLBOUT = \"$(TargetDir)/$${TARGET}.tlb\"
     GENERATED += $${OBJECTS_DIR}/$${TARGET}.idl $${ACTIVEQT_TLBOUT}
 } else {