1 files changed, 0 insertions, 86 deletions

diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 5eb30160..62374199 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -822,38 +822,6 @@ void VcprojGenerator::initPostBuildEventTools()
 	RConf.postBuild.Description += var("MSVCPROJ_COPY_DLL_DESC");
 	RConf.postBuild.CommandLine += var("MSVCPROJ_COPY_DLL");
     }
-    if( project->isActiveConfig( "activeqt" ) ) {
-	TQString name = project->first( "QMAKE_ORIG_TARGET" );
-	TQString nameext = project->first( "TARGET" );
-	TQString objdir = project->first( "OBJECTS_DIR" );
-	TQString idc = project->first( "QMAKE_IDC" );
-
-	RConf.postBuild.Description = "Finalizing ActiveTQt server...";
-	if ( !RConf.postBuild.CommandLine.isEmpty() )
-	    RConf.postBuild.CommandLine += " && ";
-
-	if( project->isActiveConfig( "dll" ) ) { // In process
-	    RConf.postBuild.CommandLine +=
-		// call idc to generate .idl file from .dll
-		idc + " "$(TargetPath)" -idl " + objdir + name + ".idl -version 1.0 && " +
-		// call midl to create implementations of the .idl file
-		project->first( "QMAKE_IDL" ) + " /nologo " + objdir + name + ".idl /tlb " + objdir + name + ".tlb && " +
-		// call idc to replace tlb...
-		idc + " "$(TargetPath)" /tlb " + objdir + name + ".tlb && " +
-		// register server
-		idc + " "$(TargetPath)" /regserver";
-	} else { // out of process
-	    RConf.postBuild.CommandLine =
-		// call application to dump idl
-		""$(TargetPath)" -dumpidl " + objdir + name + ".idl -version 1.0 && " +
-		// call midl to create implementations of the .idl file
-		project->first( "QMAKE_IDL" ) + " /nologo " + objdir + name + ".idl /tlb " + objdir + name + ".tlb && " +
-		// call idc to replace tlb...
-		idc + " "$(TargetPath)" /tlb " + objdir + name + ".tlb && " +
-		// call app to register
-		""$(TargetPath)" -regserver";
-	}
-    }
 }
 
 void VcprojGenerator::initPreLinkEventTools()
@@ -1177,13 +1145,6 @@ void VcprojGenerator::initOld()
 			(*libit).replace(TQRegExp("qt(-mt)?\\.lib"), ver);
 		}
 	    }
-	    if ( project->isActiveConfig( "activeqt" ) ) {
-		project->variables().remove("QMAKE_LIBS_QT_ENTRY");
-		project->variables()["QMAKE_LIBS_QT_ENTRY"] = "qaxserver.lib";
-		if ( project->isActiveConfig( "dll" ) ) {
-		    project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_ENTRY"];
-		}
-	    }
 	    if ( !project->isActiveConfig("dll") && !project->isActiveConfig("plugin") ) {
 		project->variables()["QMAKE_LIBS"] +=project->variables()["QMAKE_LIBS_QT_ENTRY"];
 	    }
@@ -1403,53 +1364,6 @@ void VcprojGenerator::initOld()
 	project->variables()["MSVCPROJ_COPY_DLL_DESC"].append( deststr );
     }
 
-    // ACTIVEQT ------------------------------------------------------
-    if ( project->isActiveConfig("activeqt") ) {
-	TQString idl = project->variables()["QMAKE_IDL"].first();
-	TQString idc = project->variables()["QMAKE_IDC"].first();
-	TQString version = project->variables()["VERSION"].first();
-	if ( version.isEmpty() )
-	    version = "1.0";
-
-	TQString objdir = project->first( "OBJECTS_DIR" );
-	project->variables()["MSVCPROJ_IDLSOURCES"].append( objdir + targetfilename + ".idl" );
-	if ( project->isActiveConfig( "dll" ) ) {
-	    TQString regcmd = "# Begin Special Build Tool\n"
-			    "TargetPath=" + targetfilename + "\n"
-			    "SOURCE=$(InputPath)\n"
-			    "PostBuild_Desc=Finalizing ActiveTQt server...\n"
-			    "PostBuild_Cmds=" +
-			    idc + " %1 -idl " + objdir + targetfilename + ".idl -version " + version +
-			    "\t" + idl + " /nologo " + objdir + targetfilename + ".idl /tlb " + objdir + targetfilename + ".tlb" +
-			    "\t" + idc + " %1 /tlb " + objdir + targetfilename + ".tlb"
-			    "\tregsvr32 /s %1\n"
-			    "# End Special Build Tool";
-
-	    TQString executable = project->variables()["MSVCPROJ_TARGETDIRREL"].first() + "\\" + project->variables()["TARGET"].first();
-	    project->variables()["MSVCPROJ_COPY_DLL_REL"].append( regcmd.arg(executable).arg(executable).arg(executable) );
-
-	    executable = project->variables()["MSVCPROJ_TARGETDIRDEB"].first() + "\\" + project->variables()["TARGET"].first();
-	    project->variables()["MSVCPROJ_COPY_DLL_DBG"].append( regcmd.arg(executable).arg(executable).arg(executable) );
-	} else {
-	    TQString regcmd = "# Begin Special Build Tool\n"
-			    "TargetPath=" + targetfilename + "\n"
-			    "SOURCE=$(InputPath)\n"
-			    "PostBuild_Desc=Finalizing ActiveTQt server...\n"
-			    "PostBuild_Cmds="
-			    "%1 -dumpidl " + objdir + targetfilename + ".idl -version " + version +
-			    "\t" + idl + " /nologo " + objdir + targetfilename + ".idl /tlb " + objdir + targetfilename + ".tlb"
-			    "\t" + idc + " %1 /tlb " + objdir + targetfilename + ".tlb"
-			    "\t%1 -regserver\n"
-			    "# End Special Build Tool";
-
-	    TQString executable = project->variables()["MSVCPROJ_TARGETDIRREL"].first() + "\\" + project->variables()["TARGET"].first();
-	    project->variables()["MSVCPROJ_REGSVR_REL"].append( regcmd.arg(executable).arg(executable).arg(executable) );
-
-	    executable = project->variables()["MSVCPROJ_TARGETDIRDEB"].first() + "\\" + project->variables()["TARGET"].first();
-	    project->variables()["MSVCPROJ_REGSVR_DBG"].append( regcmd.arg(executable).arg(executable).arg(executable) );
-	}
-    }
-
     if ( !project->variables()["DEF_FILE"].isEmpty() )
 	project->variables()["MSVCPROJ_LFLAGS"].append("/DEF:"+project->first("DEF_FILE"));