Remove documentation about activeqt, because the latter is part of the commercial edition of Qt3

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

1 files changed, 3 insertions, 56 deletions

diff --git a/qmake/generators/win32/msvc_dsp.cpp b/qmake/generators/win32/msvc_dsp.cpp
index 6b6b8fdbd..e291718e1 100644
--- a/qmake/generators/win32/msvc_dsp.cpp
+++ b/qmake/generators/win32/msvc_dsp.cpp
@@ -705,12 +705,6 @@ DspMakefileGenerator::init()
 			(*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"];
 	    }
@@ -926,12 +920,6 @@ DspMakefileGenerator::init()
     TQString dest;
     TQString postLinkStep;
     TQString copyDllStep;
-    TQString activeTQtStepPreCopyDll;
-    TQString activeTQtStepPostCopyDll;
-    TQString activeTQtStepPreCopyDllDebug;
-    TQString activeTQtStepPostCopyDllDebug;
-    TQString activeTQtStepPreCopyDllRelease;
-    TQString activeTQtStepPostCopyDllRelease;
 
     if ( !project->variables()["QMAKE_POST_LINK"].isEmpty() )
 	postLinkStep += var("QMAKE_POST_LINK");
@@ -959,59 +947,18 @@ DspMakefileGenerator::init()
 	}
     }
 
-    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";
-	project->variables()["MSVCDSP_IDLSOURCES"].append( var("OBJECTS_DIR") + targetfilename + ".idl" );
-	if ( project->isActiveConfig( "dll" ) ) {
-	    activeTQtStepPreCopyDll += 
-			     "\t" + idc + " %1 -idl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version +
-			     "\t" + idl + " /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb" +
-			     "\t" + idc + " %2 /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb";
-	    activeTQtStepPostCopyDll +=
-			     "\t" + idc + " %1 /regserver\n";
-
-	    TQString executable = project->variables()["MSVCDSP_TARGETDIRREL"].first() + "\\" + targetfilename + ".dll";
-	    activeTQtStepPreCopyDllRelease = activeTQtStepPreCopyDll.arg(executable).arg(executable);
-	    activeTQtStepPostCopyDllRelease = activeTQtStepPostCopyDll.arg(executable);
-
-	    executable = project->variables()["MSVCDSP_TARGETDIRDEB"].first() + "\\" + targetfilename + ".dll";
-	    activeTQtStepPreCopyDllDebug = activeTQtStepPreCopyDll.arg(executable).arg(executable);
-	    activeTQtStepPostCopyDllDebug = activeTQtStepPostCopyDll.arg(executable);
-	} else {
-	    activeTQtStepPreCopyDll += 
-			     "\t%1 -dumpidl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version +
-			     "\t" + idl + " /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb" +
-			     "\t" + idc + " %2 /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb";
-	    activeTQtStepPostCopyDll +=
-			     "\t%1 -regserver\n";
-	    TQString executable = project->variables()["MSVCDSP_TARGETDIRREL"].first() + "\\" + targetfilename + ".exe";
-	    activeTQtStepPreCopyDllRelease = activeTQtStepPreCopyDll.arg(executable).arg(executable);
-	    activeTQtStepPostCopyDllRelease = activeTQtStepPostCopyDll.arg(executable);
-
-	    executable = project->variables()["MSVCDSP_TARGETDIRDEB"].first() + "\\" + targetfilename + ".exe";
-	    activeTQtStepPreCopyDllDebug = activeTQtStepPreCopyDll.arg(executable).arg(executable);
-	    activeTQtStepPostCopyDllDebug = activeTQtStepPostCopyDll.arg(executable);
-	}
-
-    }
-
-    
-    if ( !postLinkStep.isEmpty() || !copyDllStep.isEmpty() || !activeTQtStepPreCopyDllDebug.isEmpty() || !activeTQtStepPreCopyDllRelease.isEmpty() ) {
+    if ( !postLinkStep.isEmpty() || !copyDllStep.isEmpty() ) {
 	project->variables()["MSVCDSP_POST_LINK_DBG"].append(
 	    "# Begin Special Build Tool\n"
 	    "SOURCE=$(InputPath)\n"
 	    "PostBuild_Desc=Post Build Step\n"
-	    "PostBuild_Cmds=" + postLinkStep + activeTQtStepPreCopyDllDebug + copyDllStep + activeTQtStepPostCopyDllDebug + "\n"
+	    "PostBuild_Cmds=" + postLinkStep + copyDllStep + "\n"
 	    "# End Special Build Tool\n" );
 	project->variables()["MSVCDSP_POST_LINK_REL"].append(
 	    "# Begin Special Build Tool\n"
 	    "SOURCE=$(InputPath)\n"
 	    "PostBuild_Desc=Post Build Step\n"
-	    "PostBuild_Cmds=" + postLinkStep + activeTQtStepPreCopyDllRelease + copyDllStep + activeTQtStepPostCopyDllRelease + "\n"
+	    "PostBuild_Cmds=" + postLinkStep + copyDllStep + "\n"
 	    "# End Special Build Tool\n" );
     }