diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-04-26 11:08:23 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-04-26 11:08:23 +0000 |
| commit | 75d4742e0481d236aba9913768f24b377603f6c6 (patch) | |
| tree | f799474f9dc86fdc12ff5aea28f545e4c58d28fa /tools | |
| parent | 84330007e12122bf1b690a4e68b5ef8e973c7882 (diff) | |
| parent | bb4b86618dc930e0035c5829e336f2606d140ada (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 7fd0b984db..9757e857e5 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -145,6 +145,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"; @@ -807,6 +808,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") { @@ -1852,6 +1858,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 -------------------------------------------------------------------------------- @@ -2661,6 +2670,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") @@ -3767,6 +3781,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................." |