summaryrefslogtreecommitdiffstats
path: root/qmake/generators/win32/msvc_vcproj.cpp
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2024-06-13 11:12:50 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2024-06-14 10:09:21 +0900
commit8a071b48ef8c8900163227ccc622833e26ba4064 (patch)
treed55e89acc80cb967dc1b3d32b94281941c6ae77f /qmake/generators/win32/msvc_vcproj.cpp
parent7bc57326e69b9c3f0eaeda63e4a49b67ba611426 (diff)
downloadtqt3-8a071b48ef8c8900163227ccc622833e26ba4064.tar.gz
tqt3-8a071b48ef8c8900163227ccc622833e26ba4064.zip
Remove documentation about activeqt, because the latter is part of the commercial edition of Qt3
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'qmake/generators/win32/msvc_vcproj.cpp')
-rw-r--r--qmake/generators/win32/msvc_vcproj.cpp86
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 += " &amp;&amp; ";
-
- if( project->isActiveConfig( "dll" ) ) { // In process
- RConf.postBuild.CommandLine +=
- // call idc to generate .idl file from .dll
- idc + " &quot;$(TargetPath)&quot; -idl " + objdir + name + ".idl -version 1.0 &amp;&amp; " +
- // call midl to create implementations of the .idl file
- project->first( "QMAKE_IDL" ) + " /nologo " + objdir + name + ".idl /tlb " + objdir + name + ".tlb &amp;&amp; " +
- // call idc to replace tlb...
- idc + " &quot;$(TargetPath)&quot; /tlb " + objdir + name + ".tlb &amp;&amp; " +
- // register server
- idc + " &quot;$(TargetPath)&quot; /regserver";
- } else { // out of process
- RConf.postBuild.CommandLine =
- // call application to dump idl
- "&quot;$(TargetPath)&quot; -dumpidl " + objdir + name + ".idl -version 1.0 &amp;&amp; " +
- // call midl to create implementations of the .idl file
- project->first( "QMAKE_IDL" ) + " /nologo " + objdir + name + ".idl /tlb " + objdir + name + ".tlb &amp;&amp; " +
- // call idc to replace tlb...
- idc + " &quot;$(TargetPath)&quot; /tlb " + objdir + name + ".tlb &amp;&amp; " +
- // call app to register
- "&quot;$(TargetPath)&quot; -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"));