diff options
Diffstat (limited to 'tools/configure/configureapp.cpp')
-rw-r--r-- | tools/configure/configureapp.cpp | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index ed854a343b..9995fb179e 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1691,7 +1691,6 @@ void Configure::applySpecSpecifics() dictionary[ "REDUCE_RELOCATIONS" ] = "yes"; dictionary[ "QT_GETIFADDRS" ] = "no"; dictionary[ "QT_XKBCOMMON" ] = "no"; - dictionary[ "JAVASCRIPTCORE_JIT" ] = "no"; } } @@ -2744,12 +2743,6 @@ void Configure::generateOutputVars() if (!dictionary["QT_LFLAGS_SQLITE"].isEmpty()) qmakeVars += "QT_LFLAGS_SQLITE += " + dictionary["QT_LFLAGS_SQLITE"]; - if (dictionary["JAVASCRIPTCORE_JIT"] == "no") - qmakeVars += "JAVASCRIPTCORE_JIT = no"; - else if (dictionary["JAVASCRIPTCORE_JIT"] == "yes") - qmakeVars += "JAVASCRIPTCORE_JIT = yes"; - // else let JavaScriptCore decide - if (dictionary[ "OPENGL" ] == "yes") qtConfig += "opengl"; @@ -3527,23 +3520,6 @@ void Configure::generateConfigfiles() dictionary[ "DONE" ] = "error"; } - { - FileWriter tmpStream(buildPath + "/include/QtCore/qconfig.h"); - - tmpStream << "#include \"../../src/corelib/global/qconfig.h\"" << endl; - - if (!tmpStream.flush()) - dictionary[ "DONE" ] = "error"; - } - { - FileWriter tmpStream(buildPath + "/include/QtCore/QtConfig"); - - tmpStream << "#include \"qconfig.h\"" << endl; - - if (!tmpStream.flush()) - dictionary[ "DONE" ] = "error"; - } - if (dictionary["EDITION"] == "Evaluation" || qmakeDefines.contains("QT_EVAL")) { FileWriter tmpStream(buildPath + "/src/corelib/global/qconfig_eval.cpp"); |