summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2016-07-07 13:38:15 +0200
committerLars Knoll <lars.knoll@qt.io>2016-07-13 19:51:17 +0000
commit6f1ad48a9115ff415b0496927451d0f7f5ea284c (patch)
tree18158e85a9b2649a65ce3bc2aefe689e70fae26a /tools
parent1f3eab5536920dd8b2e333589c3675db009f0221 (diff)
Remove -fw and -l command line arguments
These arguments were nonsensical, as they would lead to every single Qt module linking to those libraries. This was probably some left-over from old times, when Qt was just a single library. Change-Id: I0343a6df270fd0d2efa5333ba4e457670f5d0910 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/configure/configureapp.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 740d8a6edb..3adf54cb04 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -904,11 +904,6 @@ void Configure::parseCmdLine()
break;
}
qmakeLibs += QString("-L" + configCmdLine.at(i));
- } else if (configCmdLine.at(i) == "-l") {
- ++i;
- if (i == argCount)
- break;
- qmakeLibs += QString("-l" + configCmdLine.at(i));
} else if (configCmdLine.at(i).startsWith("OPENSSL_LIBS=")) {
opensslLibs = configCmdLine.at(i);
} else if (configCmdLine.at(i).startsWith("OPENSSL_LIBS_DEBUG=")) {
@@ -1737,7 +1732,6 @@ bool Configure::displayHelp()
desc( "-D <define>", "Add an explicit define to the preprocessor.");
desc( "-I <includepath>", "Add an explicit include path.");
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");