diff options
Diffstat (limited to 'qmake/generators/win32/msvc_nmake.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index a1ada25f..8e313f23 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -274,23 +274,6 @@ NmakeMakefileGenerator::writeNmakeParts(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()) { @@ -332,10 +315,6 @@ NmakeMakefileGenerator::writeNmakeParts(TQTextStream &t) << varGlue("OBJECTS","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") << varGlue("QMAKE_CLEAN","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","\n") << varGlue("CLEAN_FILES","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","\n"); - 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; @@ -603,12 +582,6 @@ NmakeMakefileGenerator::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"]; } |