diff options
Diffstat (limited to 'tools/configure/configureapp.cpp')
-rw-r--r-- | tools/configure/configureapp.cpp | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index b7565093f1..a1877eb2c6 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -259,7 +259,7 @@ Configure::Configure(int& argc, char** argv) dictionary[ "PCRE" ] = "auto"; - dictionary[ "ICU" ] = "auto"; + dictionary[ "ICU" ] = "no"; dictionary[ "ANGLE" ] = "auto"; dictionary[ "DYNAMICGL" ] = "auto"; @@ -431,7 +431,15 @@ void Configure::parseCmdLine() ++i; if (i == argCount) break; - dictionary[ "QREAL" ] = configCmdLine.at(i); + QString s = dictionary[ "QREAL" ] = configCmdLine.at(i); + if (s == "float") { + dictionary[ "QREAL_STRING" ] = "\"float\""; + } else { + // escape + s = s.simplified(); + s = '"' + s.toLatin1().toPercentEncoding(QByteArray(), "-._~", '_') + '"'; + dictionary[ "QREAL_STRING" ] = s; + } } else if (configCmdLine.at(i) == "-release") { @@ -3476,24 +3484,26 @@ void Configure::generateConfigfiles() tmpStream << endl << "// Compiler sub-arch support" << endl; if (dictionary[ "SSE2" ] == "yes") - tmpStream << "#define QT_COMPILER_SUPPORTS_SSE2" << endl; + tmpStream << "#define QT_COMPILER_SUPPORTS_SSE2 1" << endl; if (dictionary[ "SSE3" ] == "yes") - tmpStream << "#define QT_COMPILER_SUPPORTS_SSE3" << endl; + tmpStream << "#define QT_COMPILER_SUPPORTS_SSE3 1" << endl; if (dictionary[ "SSSE3" ] == "yes") - tmpStream << "#define QT_COMPILER_SUPPORTS_SSSE3" << endl; + tmpStream << "#define QT_COMPILER_SUPPORTS_SSSE3 1" << endl; if (dictionary[ "SSE4_1" ] == "yes") - tmpStream << "#define QT_COMPILER_SUPPORTS_SSE4_1" << endl; + tmpStream << "#define QT_COMPILER_SUPPORTS_SSE4_1 1" << endl; if (dictionary[ "SSE4_2" ] == "yes") - tmpStream << "#define QT_COMPILER_SUPPORTS_SSE4_2" << endl; + tmpStream << "#define QT_COMPILER_SUPPORTS_SSE4_2 1" << endl; if (dictionary[ "AVX" ] == "yes") - tmpStream << "#define QT_COMPILER_SUPPORTS_AVX" << endl; + tmpStream << "#define QT_COMPILER_SUPPORTS_AVX 1" << endl; if (dictionary[ "AVX2" ] == "yes") - tmpStream << "#define QT_COMPILER_SUPPORTS_AVX2" << endl; + tmpStream << "#define QT_COMPILER_SUPPORTS_AVX2 1" << endl; if (dictionary[ "IWMMXT" ] == "yes") - tmpStream << "#define QT_COMPILER_SUPPORTS_IWMMXT" << endl; + tmpStream << "#define QT_COMPILER_SUPPORTS_IWMMXT 1" << endl; - if (dictionary["QREAL"] != "double") + if (dictionary["QREAL"] != "double") { tmpStream << "#define QT_COORD_TYPE " << dictionary["QREAL"] << endl; + tmpStream << "#define QT_COORD_TYPE_STRING " << dictionary["QREAL_STRING"] << endl; + } tmpStream << endl << "// Compile time features" << endl; |