diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-12 07:31:50 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-12 08:33:08 +0200 |
commit | 990969655c5fb4d03682e96df9b12101f5ee9815 (patch) | |
tree | b8fb5c50285105c8bc5a938fb50f93ff9f24889d /tools/configure | |
parent | a213011a53f12f101d08a04afc8fdacd2d54a232 (diff) | |
parent | e64b2234e829cc47872225debcf80d6c06db18f0 (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
config_help.txt
configure
src/corelib/io/qprocess_wince.cpp
src/plugins/platforms/windows/qwindowstheme.cpp
src/plugins/platforms/xcb/qxcbbackingstore.cpp
tests/auto/corelib/tools/qtimezone/BLACKLIST
tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
Change-Id: I26644d1cb3b78412c8ff285e2a55bea1bd641c01
Diffstat (limited to 'tools/configure')
-rw-r--r-- | tools/configure/configureapp.cpp | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 40a4c1600e..c40d11d284 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -144,6 +144,7 @@ Configure::Configure(int& argc, char** argv) : verbose(0) dictionary[ "GUI" ] = "yes"; dictionary[ "RTTI" ] = "yes"; dictionary[ "STRIP" ] = "yes"; + dictionary[ "PCH" ] = "yes"; dictionary[ "SEPARATE_DEBUG_INFO" ] = "no"; dictionary[ "SSE2" ] = "auto"; dictionary[ "SSE3" ] = "auto"; @@ -751,6 +752,11 @@ void Configure::parseCmdLine() else if (configCmdLine.at(i) == "-no-strip") dictionary[ "STRIP" ] = "no"; + else if (configCmdLine.at(i) == "-pch") + dictionary[ "PCH" ] = "yes"; + else if (configCmdLine.at(i) == "-no-pch") + dictionary[ "PCH" ] = "no"; + else if (configCmdLine.at(i) == "-accessibility") dictionary[ "ACCESSIBILITY" ] = "yes"; else if (configCmdLine.at(i) == "-no-accessibility") { @@ -1553,6 +1559,7 @@ void Configure::applySpecSpecifics() dictionary["DECORATIONS"] = "default windows styled"; } else if (platform() == QNX) { + dictionary[ "REDUCE_EXPORTS" ] = "yes"; dictionary["STACK_PROTECTOR_STRONG"] = "auto"; dictionary["SLOG2"] = "auto"; dictionary["QNX_IMF"] = "auto"; @@ -1562,7 +1569,9 @@ void Configure::applySpecSpecifics() dictionary[ "ANGLE" ] = "no"; dictionary[ "DYNAMICGL" ] = "no"; dictionary[ "FONT_CONFIG" ] = "auto"; + dictionary[ "ICU" ] = "auto"; dictionary[ "POLL" ] = "poll"; + dictionary[ "ZLIB" ] = "system"; } else if (platform() == ANDROID) { dictionary[ "REDUCE_EXPORTS" ] = "yes"; dictionary[ "BUILD" ] = "release"; @@ -1576,6 +1585,7 @@ void Configure::applySpecSpecifics() dictionary["ANDROID_STYLE_ASSETS"] = "yes"; dictionary[ "STYLE_ANDROID" ] = "yes"; dictionary[ "POLL" ] = "poll"; + dictionary[ "ZLIB" ] = "system"; } } @@ -1756,6 +1766,9 @@ bool Configure::displayHelp() desc( "-L <librarypath>", "Add an explicit library path."); desc( "-l <libraryname>", "Add an explicit library name, residing in a librarypath.\n"); + desc("PCH", "no", "-no-pch", "Do not use precompiled header support."); + desc("PCH", "yes", "-pch", "Use precopmiled header support.\n"); + desc( "-help, -h, -?", "Display this information.\n"); // 3rd party stuff options go below here -------------------------------------------------------------------------------- @@ -2022,7 +2035,7 @@ QString Configure::checkAvx512Availability() return QString(); QString available = "avx512f"; - for (int i = 0; i < sizeof(avx512features)/sizeof(avx512features[0]); ++i) { + for (size_t i = 0; i < sizeof(avx512features)/sizeof(avx512features[0]); ++i) { if (tryCompileProject("common/avx512", QStringLiteral("AVX512=%0").arg(avx512features[i]).toUpper())) { available += " avx512"; available += avx512features[i]; @@ -2366,7 +2379,9 @@ void Configure::autoDetection() if (dictionary["DIRECTWRITE"] == "auto") dictionary["DIRECTWRITE"] = checkAvailability("DIRECTWRITE") ? "yes" : "no"; - if (dictionary["DIRECTWRITE2"] == "auto") + if (dictionary["DIRECTWRITE"] == "no") + dictionary["DIRECTWRITE2"] = "no"; + else if (dictionary["DIRECTWRITE2"] == "auto") dictionary["DIRECTWRITE2"] = checkAvailability("DIRECTWRITE2") ? "yes" : "no"; // Mark all unknown "auto" to the default value.. @@ -2536,6 +2551,11 @@ void Configure::generateOutputVars() if (dictionary[ "RELEASE_TOOLS" ] == "yes") qtConfig += "release_tools"; + if (dictionary[ "PCH" ] == "yes") + qmakeConfig += "precompile_header"; + else + qmakeVars += "CONFIG -= precompile_header"; + if (dictionary[ "C++STD" ] == "c++11") qtConfig += "c++11"; else if (dictionary[ "C++STD" ] == "c++14") @@ -3564,6 +3584,7 @@ void Configure::displayConfig() sout << "Force optimized tools......." << dictionary[ "RELEASE_TOOLS" ] << endl; sout << "C++ language standard......." << dictionary[ "C++STD" ] << endl; sout << "Link Time Code Generation..." << dictionary[ "LTCG" ] << endl; + sout << "Using PCH .................." << dictionary[ "PCH" ] << endl; sout << "Accessibility support......." << dictionary[ "ACCESSIBILITY" ] << endl; sout << "RTTI support................" << dictionary[ "RTTI" ] << endl; sout << "SSE support................." |