diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-06-13 11:12:50 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-06-14 10:09:21 +0900 |
| commit | 8a071b48ef8c8900163227ccc622833e26ba4064 (patch) | |
| tree | d55e89acc80cb967dc1b3d32b94281941c6ae77f /qmake/generators/win32/borland_bmake.cpp | |
| parent | 7bc57326e69b9c3f0eaeda63e4a49b67ba611426 (diff) | |
| download | tqt-8a071b48.tar.gz tqt-8a071b48.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/borland_bmake.cpp')
| -rw-r--r-- | qmake/generators/win32/borland_bmake.cpp | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/qmake/generators/win32/borland_bmake.cpp b/qmake/generators/win32/borland_bmake.cpp index 9d8dc7cb6..aa0f7b432 100644 --- a/qmake/generators/win32/borland_bmake.cpp +++ b/qmake/generators/win32/borland_bmake.cpp @@ -207,23 +207,6 @@ BorlandMakefileGenerator::writeBorlandParts(TQTextStream &t) } } TQString targetfilename = project->variables()["TARGET"].first(); - if(project->isActiveConfig("activeqt")) { - TQString version = project->variables()["VERSION"].first(); - if ( version.isEmpty() ) - version = "1.0"; - - if ( project->isActiveConfig("dll")) { - t << "\n\t" << ("-$(IDC) $(TARGET) /idl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version); - t << "\n\t" << ("-$(IDL) /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"); - t << "\n\t" << ("-$(IDC) $(TARGET) /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"); - t << "\n\t" << ("-$(IDC) $(TARGET) /regserver" ); - } else { - t << "\n\t" << ("-$(TARGET) -dumpidl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version); - t << "\n\t" << ("-$(IDL) /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"); - t << "\n\t" << ("-$(IDC) $(TARGET) /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"); - t << "\n\t" << ("-$(TARGET) -regserver"); - } - } t << endl << endl; if(!project->variables()["RC_FILE"].isEmpty()) { @@ -272,10 +255,6 @@ BorlandMakefileGenerator::writeBorlandParts(TQTextStream &t) << varGlue("OBJECTS","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") << varGlue("QMAKE_CLEAN","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") << varGlue("CLEAN_FILES","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ",""); - if ( project->isActiveConfig("activeqt")) { - t << ("\n\t-$(DEL_FILE) " + var("OBJECTS_DIR") + targetfilename + ".idl"); - t << ("\n\t-$(DEL_FILE) " + var("OBJECTS_DIR") + targetfilename + ".tlb"); - } if(!project->isEmpty("IMAGES")) t << varGlue("QMAKE_IMAGE_COLLECTION", "\n\t-$(DEL_FILE) ", "\n\t-$(DEL_FILE) ", ""); t << endl; @@ -503,12 +482,6 @@ BorlandMakefileGenerator::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"]; } |